- MFH: Fixed bug #46889: Memory leak in strtotime().

Derick Rethans · Derick Rethans · commit e3388ff043b4 · 2008-12-18T14:57:04.000Z
diff --git a/NEWS b/NEWS
@@ -6,6 +6,7 @@ PHP                                                                        NEWS
 - Fixed security issue in imagerotate(), background colour isn't validated
   correctly with a non truecolour image. (Fixes CVE-2008-5498) (Scott)
 
+- Fixed bug #46889: Memory leak in strtotime(). (Derick)
 - Fixed bug #46798 (Crash in mssql extension when retrieving a NULL value
   inside a binary or image column type). (Ilia)
 - Fixed bug #46782 (fastcgi.c parse error). (Matt)
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Oct 26 11:59:08 2008 */
+/* Generated by re2c 0.13.5 on Thu Dec 18 15:52:22 2008 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -22483,7 +22483,7 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container
 
 void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options)
 {
-	if (!(options && TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {
+	if (!(options & TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {
 		parsed->h = 0;
 		parsed->i = 0;
 		parsed->s = 0;
@@ -22503,7 +22503,7 @@ void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options)
 		parsed->tz_abbr = now->tz_abbr ? strdup(now->tz_abbr) : NULL;
 	}
 	if (!parsed->tz_info) {
-		parsed->tz_info = now->tz_info ? timelib_tzinfo_clone(now->tz_info) : NULL;
+		parsed->tz_info = now->tz_info ? (!(options & TIMELIB_NO_CLONE) ? timelib_tzinfo_clone(now->tz_info) : now->tz_info) : NULL;
 	}
 	if (parsed->zone_type == 0 && now->zone_type != 0) {
 		parsed->zone_type = now->zone_type;
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
@@ -1619,7 +1619,7 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container
 
 void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options)
 {
-	if (!(options && TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {
+	if (!(options & TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {
 		parsed->h = 0;
 		parsed->i = 0;
 		parsed->s = 0;
@@ -1639,7 +1639,7 @@ void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options)
 		parsed->tz_abbr = now->tz_abbr ? strdup(now->tz_abbr) : NULL;
 	}
 	if (!parsed->tz_info) {
-		parsed->tz_info = now->tz_info ? timelib_tzinfo_clone(now->tz_info) : NULL;
+		parsed->tz_info = now->tz_info ? (!(options & TIMELIB_NO_CLONE) ? timelib_tzinfo_clone(now->tz_info) : now->tz_info) : NULL;
 	}
 	if (parsed->zone_type == 0 && now->zone_type != 0) {
 		parsed->zone_type = now->zone_type;
diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
@@ -28,6 +28,7 @@
 
 #define TIMELIB_NONE             0x00
 #define TIMELIB_OVERRIDE_TIME    0x01
+#define TIMELIB_NO_CLONE         0x02
 
 #define TIMELIB_SPECIAL_WEEKDAY  0x01
 
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1143,7 +1143,7 @@ PHP_FUNCTION(strtotime)
 	t = timelib_strtotime(times, time_len, &error, DATE_TIMEZONEDB);
 	error1 = error->error_count;
 	timelib_error_container_dtor(error);
-	timelib_fill_holes(t, now, 0);
+	timelib_fill_holes(t, now, TIMELIB_NO_CLONE);
 	timelib_update_ts(t, tzi);
 	ts = timelib_date_to_int(t, &error2);
 

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,7 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container`
`1619`	`1619`
`1620`	`1620`	`void timelib_fill_holes(timelib_time parsed, timelib_time now, int options)`
`1621`	`1621`	`{`
`1622`		`- if (!(options && TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {`
	`1622`	`+ if (!(options & TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) {`
`1623`	`1623`	`parsed->h = 0;`
`1624`	`1624`	`parsed->i = 0;`
`1625`	`1625`	`parsed->s = 0;`
`@@ -1639,7 +1639,7 @@ void timelib_fill_holes(timelib_time parsed, timelib_time now, int options)`
`1639`	`1639`	`parsed->tz_abbr = now->tz_abbr ? strdup(now->tz_abbr) : NULL;`
`1640`	`1640`	`}`
`1641`	`1641`	`if (!parsed->tz_info) {`
`1642`		`- parsed->tz_info = now->tz_info ? timelib_tzinfo_clone(now->tz_info) : NULL;`
	`1642`	`+ parsed->tz_info = now->tz_info ? (!(options & TIMELIB_NO_CLONE) ? timelib_tzinfo_clone(now->tz_info) : now->tz_info) : NULL;`
`1643`	`1643`	`}`
`1644`	`1644`	`if (parsed->zone_type == 0 && now->zone_type != 0) {`
`1645`	`1645`	`parsed->zone_type = now->zone_type;`