Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

dstogov · dstogov · commit 504c60dc4451 · 2013-11-27T14:58:54.000+04:00
* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.24
 
+- Date:
+  . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)
+
 ?? ??? 2013, PHP 5.4.23
 
 - Core:
diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Dec  5 22:02:27 2011 */
+/* Generated by re2c 0.13.5 on Wed Nov 27 11:10:58 2013 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
    +----------------------------------------------------------------------+
@@ -415,7 +415,7 @@ static int scan(Scanner *s)
 					break;
 			}
 			ptr++;
-		} while (*ptr);
+		} while (!s->errors->error_count && *ptr);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re
@@ -383,7 +383,7 @@ isoweek          = year4 "-"? "W" weekofyear;
 					break;
 			}
 			ptr++;
-		} while (*ptr);
+		} while (!s->errors->error_count && *ptr);
 		s->have_period = 1;
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekofyear;`
`383`	`383`	`break;`
`384`	`384`	`}`
`385`	`385`	`ptr++;`
`386`		`- } while (*ptr);`
	`386`	`+ } while (!s->errors->error_count && *ptr);`
`387`	`387`	`s->have_period = 1;`
`388`	`388`	`TIMELIB_DEINIT;`
`389`	`389`	`return TIMELIB_PERIOD;`