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

dstogov · dstogov · commit 5e8bb519f09c · 2013-11-27T14:58:23.000+04:00
* 'PHP-5.6' of git.php.net:php-src:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
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 Sun Mar 31 10:48:17 2013 */
+/* Generated by re2c 0.13.5 on Wed Nov 27 11:14:23 2013 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
    +----------------------------------------------------------------------+
@@ -380,7 +380,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
@@ -348,7 +348,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
`@@ -348,7 +348,7 @@ isoweek = year4 "-"? "W" weekofyear;`
`348`	`348`	`break;`
`349`	`349`	`}`
`350`	`350`	`ptr++;`
`351`		`- } while (*ptr);`
	`351`	`+ } while (!s->errors->error_count && *ptr);`
`352`	`352`	`s->have_period = 1;`
`353`	`353`	`TIMELIB_DEINIT;`
`354`	`354`	`return TIMELIB_PERIOD;`