diff options
| author | Pierre Joye <pajoye@php.net> | 2011-02-14 09:40:10 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-02-14 09:40:10 +0000 |
| commit | 409c5a9c7bf0d0175d7682cde7e98a9ea2c5b5e9 (patch) | |
| tree | e97bf77709d244a9e057d895aa3d9fa77c67e5a7 | |
| parent | dbccc8c112e0afaa34db7a913096f849a02da4de (diff) | |
| download | php-git-409c5a9c7bf0d0175d7682cde7e98a9ea2c5b5e9.tar.gz | |
-Bug #54002, fix windows build, use the relevant values in the warnings
| -rw-r--r-- | ext/exif/exif.c | 7 | ||||
| -rw-r--r-- | ext/exif/tests/bug54002.phpt | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 2063180946..2b8e5f2276 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -41,7 +41,7 @@ #include "ext/standard/file.h" #ifdef PHP_WIN32 -include "win32/php_stdint.h" +#include "win32/php_stdint.h" #endif #if HAVE_EXIF @@ -2847,13 +2847,14 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha } if (components < 0) { - exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal byte_count(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), byte_count); + exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), components); return FALSE; } + byte_count_signed = (int64_t)components * php_tiff_bytes_per_format[format]; if (byte_count_signed < 0 || (byte_count_signed > 2147483648)) { - exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal byte_count(%ld)", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), byte_count); + exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal byte_count", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC)); return FALSE; } diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt index 19992464eb..c51fa58897 100644 --- a/ext/exif/tests/bug54002.phpt +++ b/ext/exif/tests/bug54002.phpt @@ -11,10 +11,10 @@ exif_read_data(__DIR__ . '/bug54002_2.jpeg'); ?> --EXPECTF-- -Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count(%d) in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d Warning: exif_read_data(bug54002_1.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer offset(%s) in %sbug54002.php on line %d -Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count(%d) in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d Warning: exif_read_data(bug54002_2.jpeg): Process tag(xA000=FlashPixVer): Illegal pointer offset(%s) in %sbug54002.php on line %d |