derick Thu Dec 18 14:54:51 2008 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_date.c parse_date.re timelib.h
Log:
- Fixed bug #46889: Memory leak in strtotime().
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.213&r2=1.214&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.213 php-src/ext/date/php_date.c:1.214
--- php-src/ext/date/php_date.c:1.213 Tue Dec 2 18:01:07 2008
+++ php-src/ext/date/php_date.c Thu Dec 18 14:54:50 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.213 2008/12/02 18:01:07 derick Exp $ */
+/* $Id: php_date.c,v 1.214 2008/12/18 14:54:50 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1513,7 +1513,7 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.100 php-src/ext/date/lib/parse_date.c:1.101
--- php-src/ext/date/lib/parse_date.c:1.100 Wed Nov 5 10:41:48 2008
+++ php-src/ext/date/lib/parse_date.c Thu Dec 18 14:54:50 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 5 11:39:34 2008 */
+/* Generated by re2c 0.13.5 on Thu Dec 18 15:50:45 2008 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.c,v 1.100 2008/11/05 10:41:48 derick Exp $ */
+/* $Id: parse_date.c,v 1.101 2008/12/18 14:54:50 derick Exp $ */
#include "timelib.h"
@@ -24232,7 +24232,7 @@
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;
@@ -24252,7 +24252,7 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.91&r2=1.92&diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.91 php-src/ext/date/lib/parse_date.re:1.92
--- php-src/ext/date/lib/parse_date.re:1.91 Wed Nov 5 10:41:48 2008
+++ php-src/ext/date/lib/parse_date.re Thu Dec 18 14:54:51 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.re,v 1.91 2008/11/05 10:41:48 derick Exp $ */
+/* $Id: parse_date.re,v 1.92 2008/12/18 14:54:51 derick Exp $ */
#include "timelib.h"
@@ -2089,7 +2089,7 @@
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;
@@ -2109,7 +2109,7 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timelib.h?r1=1.32&r2=1.33&diff_format=u
Index: php-src/ext/date/lib/timelib.h
diff -u php-src/ext/date/lib/timelib.h:1.32 php-src/ext/date/lib/timelib.h:1.33
--- php-src/ext/date/lib/timelib.h:1.32 Tue Jul 15 17:37:33 2008
+++ php-src/ext/date/lib/timelib.h Thu Dec 18 14:54:51 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: timelib.h,v 1.32 2008/07/15 17:37:33 derick Exp $ */
+/* $Id: timelib.h,v 1.33 2008/12/18 14:54:51 derick Exp $ */
#ifndef __TIMELIB_H__
#define __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
#define TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH 0x02