Skip to content
Permalink
Browse files

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Same issue as #72926 in another place.
  • Loading branch information...
smalyshev committed Sep 5, 2016
2 parents c3dfe57 + b578580 commit a2fdf0f4135f5a29e613c1c6c53d378dc6ff7bed
Showing with 4 additions and 1 deletion.
  1. +4 −1 ext/exif/exif.c
@@ -3723,8 +3723,11 @@ static int exif_process_IFD_in_TIFF(image_info_type *ImageInfo, size_t dir_offse
fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
if (fgot < ImageInfo->Thumbnail.size) {
EXIF_ERRLOG_THUMBEOF(ImageInfo)
efree(ImageInfo->Thumbnail.data);
ImageInfo->Thumbnail.data = NULL;
} else {
exif_thumbnail_build(ImageInfo);
}
exif_thumbnail_build(ImageInfo);
}
}
}

0 comments on commit a2fdf0f

Please sign in to comment.
You can’t perform that action at this time.