iliaa Wed Mar 12 17:32:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
Fixed bug #44388 (Crash inside exif_read_data() on invalid images)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.4&r2=1.173.2.5.2.20.2.5&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.4
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.5
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.4 Mon Dec 31 07:17:08 2007
+++ php-src/ext/exif/exif.c Wed Mar 12 17:32:01 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.4 2007/12/31 07:17:08 sebastian Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.5 2008/03/12 17:32:01 iliaa Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.4 2007/12/31 07:17:08
sebastian Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.5 2008/03/12 17:32:01
iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -2877,7 +2877,7 @@
/* exception are IFD pointers */
exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING,
"Process tag(x%04X=%s): Illegal pointer offset(x%04X + x%04X = x%04X > x%04X)",
tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), offset_val,
byte_count, offset_val+byte_count, IFDlength);
}
- return TRUE;
+ return FALSE;
}
if (byte_count>sizeof(cbuf)) {
/* mark as outside range and get buffer */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
