cvs: php4 /ext/exif exif.c
| From: | Jani Taskinen | Date: | Sat, 04 Aug 2001 01:56:40 +0000 |
| Subject: | cvs: php4 /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6531@lists.php.net to get a copy of this message | ||
sniper Fri Aug 3 21:56:40 2001 EDT
Modified files:
/php4/ext/exif exif.c
Log:
Fixed bug: #11784 (combined with fixes Rasmus committed..)
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.23 php4/ext/exif/exif.c:1.24
--- php4/ext/exif/exif.c:1.23 Fri Aug 3 18:33:10 2001
+++ php4/ext/exif/exif.c Fri Aug 3 21:56:40 2001
@@ -1123,10 +1123,6 @@
ImageInfoType ImageInfo;
char tmp[64];
- /*ImageInfo.Thumbnail = NULL;
- ImageInfo.ThumbnailSize = 0;
- */
-
if ((ac < 1 || ac > 2) || zend_get_parameters_ex(ac, &p_name, &p_readall) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1217,7 +1213,7 @@
if(ImageInfo.Comments[0]) {
add_assoc_string(return_value,"Comments",ImageInfo.Comments,1);
}
- if(ImageInfo.ThumbnailSize) {
+ if(ImageInfo.ThumbnailSize && ImageInfo.Thumbnail) {
add_assoc_stringl(return_value,"Thumbnail",ImageInfo.Thumbnail,ImageInfo.ThumbnailSize,1);
add_assoc_long(return_value,"ThumbnailSize",ImageInfo.ThumbnailSize);
efree(ImageInfo.Thumbnail);