summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-04-12 18:33:08 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-04-12 18:33:08 +0000
commit0e80f2620777b5fe55378b909d55ac23ad184ef1 (patch)
tree5dcaeea772c6179c23842a18c9baee0e564bf5c1
parent047ed8dfbb1beded4bf3fbc590a4052c87644ed2 (diff)
downloadphp-git-0e80f2620777b5fe55378b909d55ac23ad184ef1.tar.gz
Fixed bug #54121 (error message format string typo).
-rw-r--r--NEWS3
-rw-r--r--ext/exif/exif.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2e0029ee07..3ad19459fa 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ PHP NEWS
- DBA extension:
. Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)
+- Exif extesion:
+ . Fixed bug #54121 (error message format string typo). (Ilia)
+
- Filter extension:
. Fixed bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented). (Ilia)
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 9593f70d2c..9458987c2e 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2909,7 +2909,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
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);