[packages/php.git] / php-5.3.7-bug-54121.patch

--- PHP_5_3/ext/exif/exif.c	2011/04/12 17:30:42	310166
+++ PHP_5_3/ext/exif/exif.c	2011/04/12 18:33:08	310167
@@ -2909,7 +2909,7 @@
 			fgot = php_stream_tell(ImageInfo->infile);
 			if (fgot!=offset_val) {
 				EFREE_IF(outside);
-				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x08X", fgot, offset_val);
+				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, offset_val);
 				return FALSE;
 			}
 			fgot = php_stream_read(ImageInfo->infile, value_ptr, byte_count);
Commit	Line	Data
fb98beff ER	1	--- PHP_5_3/ext/exif/exif.c 2011/04/12 17:30:42 310166
	2	+++ PHP_5_3/ext/exif/exif.c 2011/04/12 18:33:08 310167
	3	@@ -2909,7 +2909,7 @@
	4	fgot = php_stream_tell(ImageInfo->infile);
	5	if (fgot!=offset_val) {
	6	EFREE_IF(outside);
	7	- exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x08X", fgot, offset_val);
	8	+ exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, offset_val);
	9	return FALSE;
	10	}
	11	fgot = php_stream_read(ImageInfo->infile, value_ptr, byte_count);