iliaa           Wed Mar 12 17:33:14 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/exif   exif.c 
    /php-src    NEWS 
  Log:
  
  MFB: 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.24&r2=1.173.2.5.2.25&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.24 
php-src/ext/exif/exif.c:1.173.2.5.2.25
--- php-src/ext/exif/exif.c:1.173.2.5.2.24      Fri Mar  7 18:41:02 2008
+++ php-src/ext/exif/exif.c     Wed Mar 12 17:33:14 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02 pajoye Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.25 2008/03/12 17:33:14 iliaa Exp $ */
 
 /*  ToDos
  *
@@ -142,7 +142,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02 
pajoye Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.25 2008/03/12 17:33:14 
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 */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1114&r2=1.2027.2.547.2.1115&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1114 php-src/NEWS:1.2027.2.547.2.1115
--- php-src/NEWS:1.2027.2.547.2.1114    Wed Mar 12 11:27:42 2008
+++ php-src/NEWS        Wed Mar 12 17:33:14 2008
@@ -2,6 +2,7 @@
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Mar 2008 , PHP 5.2.6
 - Fixed bug #44394 (Last two bytes missing from output). (Felipe)
+- Fixed bug #44388 (Crash inside exif_read_data() on invalid images) (Ilia)
 - Fixed bug #44373 (PDO_OCI extension compile failed). (Felipe)
 
 06 Mar 2008, PHP 5.2.6RC2



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to