Fix bug #67250 (iptcparse out-of-bounds read)

12 years ago · 3e9cb6a4a5
3 changed files with 12 additions and 0 deletions
--- a/1
+++ b/1
@ -12,6 +12,7 @@ PHP                                                                        NEWS
  . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
    zend_exceptions.c). (Bob)
  . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
+  . Fixed bug #67250 (iptcparse out-of-bounds read). (Stas)

 - Date:
  . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@ -329,6 +329,9 @@ PHP_FUNCTION(iptcparse)
 		recnum = buffer[ inx++ ];

 		if (buffer[ inx ] & (unsigned char) 0x80) { /* long tag */
+            if((inx+6) >= str_len) {
+                break;
+            }
 			len = (((long) buffer[ inx + 2 ]) << 24) + (((long) buffer[ inx + 3 ]) << 16) + 
 				  (((long) buffer[ inx + 4 ]) <<  8) + (((long) buffer[ inx + 5 ]));
 			inx += 6;
--- a/ext/standard/tests/image/bug67250.phpt
+++ b/ext/standard/tests/image/bug67250.phpt
@ -0,0 +1,8 @@
+--TEST--
+Bug #67250 (iptcparse out-of-bounds read)
+--FILE--
+<?php
+var_dump(iptcparse("\x1C\x02_\x80___"));
+?>
+--EXPECT--
+bool(false)