[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/exif exif.c

2008-03-12 Thread Ilia Alshanetsky 
iliaa   Wed Mar 12 17:33:14 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/exif   exif.c 
/php-srcNEWS 
  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.24r2=1.173.2.5.2.25diff_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_countsizeof(cbuf)) {
/* mark as outside range and get buffer */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1114r2=1.2027.2.547.2.1115diff_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.1114Wed Mar 12 11:27:42 2008
+++ php-src/NEWSWed 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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/exif exif.c

2007-12-16 Thread Ilia Alshanetsky 
iliaa   Sun Dec 16 17:14:55 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/exif   exif.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #43606 (define missing depencies of the exif extension)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20r2=1.173.2.5.2.21diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20 
php-src/ext/exif/exif.c:1.173.2.5.2.21
--- php-src/ext/exif/exif.c:1.173.2.5.2.20  Sun Jun 10 20:12:45 2007
+++ php-src/ext/exif/exif.c Sun Dec 16 17:14:54 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.173.2.5.2.20 2007/06/10 20:12:45 iliaa Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.21 2007/12/16 17:14:54 iliaa Exp $ */
 
 /*  ToDos
  *
@@ -142,7 +142,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20 2007/06/10 20:12:45 
iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.21 2007/12/16 17:14:54 
iliaa Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -241,12 +241,21 @@
 }
 /* }}} */
 
+/* {{{ exif dependencies */
+static const zend_module_dep exif_module_deps[] = {
+   ZEND_MOD_REQUIRED(standard)
+   #if EXIF_USE_MBSTRING
+   ZEND_MOD_REQUIRED(mbstring)
+   #endif
+   {NULL, NULL, NULL}
+};
+/* }}} */
+
 /* {{{ exif_module_entry
  */
 zend_module_entry exif_module_entry = {
-#if ZEND_MODULE_API_NO = 20010901
-   STANDARD_MODULE_HEADER,
-#endif
+   STANDARD_MODULE_HEADER_EX, NULL,
+   exif_module_deps,
exif,
exif_functions,
PHP_MINIT(exif), 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1033r2=1.2027.2.547.2.1034diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1033 php-src/NEWS:1.2027.2.547.2.1034
--- php-src/NEWS:1.2027.2.547.2.1033Thu Dec 13 00:33:26 2007
+++ php-src/NEWSSun Dec 16 17:14:54 2007
@@ -3,6 +3,8 @@
 ?? ??? 2008, PHP 5.2.6
 - Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
 
+- Fixed bug #43606 (define missing depencies of the exif extension)
+  (crrodriguez at suse dot de)
 - Fixed bug #43580 (removed bogus declaration of a non-existent php_is_url()  
   function). (Ilia)
 - Fixed bug #43533 (escapeshellarg('') returns null). (Ilia)

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