Fixed bug #66060 (Heap buffer over-read in DateInterval)

remicollet · smalyshev · commit a0bb3fd6793f · 2014-07-18T15:39:37.000-07:00
Conflicts:
	ext/date/lib/parse_iso_intervals.c
diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c
@@ -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
`@@ -415,7 +415,7 @@ static int scan(Scanner *s)`
`415`	`415`	`break;`
`416`	`416`	`}`
`417`	`417`	`ptr++;`
`418`		`- } while (*ptr);`
	`418`	`+ } while (!s->errors->error_count && *ptr);`
`419`	`419`	`s->have_period = 1;`
`420`	`420`	`TIMELIB_DEINIT;`
`421`	`421`	`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;`