php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-12 10:33:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug: #11784 (combined with fixes Rasmus committed..)

Browse Source
This commit is contained in:
foobar
2001-08-04 01:56:40 +00:00
parent c6454c83f4
commit faaeee3705
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/exif/exif.c
View File

@@ -1123,10 +1123,6 @@ PHP_FUNCTION(read_exif_data)
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 @@ PHP_FUNCTION(read_exif_data)
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);