derick Thu Dec 18 14:55:53 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c /php-src/ext/date/lib parse_date.c parse_date.re timelib.h Log: - MFH: Fixed bug #46889: Memory leak in strtotime(). http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.61&r2=1.43.2.45.2.51.2.62&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.61 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.62 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.61 Tue Dec 2 18:02:16 2008 +++ php-src/ext/date/php_date.c Thu Dec 18 14:55:13 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.61 2008/12/02 18:02:16 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.62 2008/12/18 14:55:13 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -1388,7 +1388,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.29.2.30.2.14.2.28&r2=1.29.2.30.2.14.2.29&diff_format=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.28 php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.29 --- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.28 Thu Nov 6 09:45:58 2008 +++ php-src/ext/date/lib/parse_date.c Thu Dec 18 14:55:14 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Nov 5 11:44:09 2008 */ +/* Generated by re2c 0.13.5 on Thu Dec 18 14:58:43 2008 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.29.2.30.2.14.2.28 2008/11/06 09:45:58 derick Exp $ */ +/* $Id: parse_date.c,v 1.29.2.30.2.14.2.29 2008/12/18 14:55:14 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.26.2.27.2.12.2.25&r2=1.26.2.27.2.12.2.26&diff_format=u Index: php-src/ext/date/lib/parse_date.re diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.25 php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.26 --- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.25 Wed Nov 5 10:42:42 2008 +++ php-src/ext/date/lib/parse_date.re Thu Dec 18 14:55:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re,v 1.26.2.27.2.12.2.25 2008/11/05 10:42:42 derick Exp $ */ +/* $Id: parse_date.re,v 1.26.2.27.2.12.2.26 2008/12/18 14:55:36 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.10.2.11.2.3.2.8&r2=1.10.2.11.2.3.2.9&diff_format=u Index: php-src/ext/date/lib/timelib.h diff -u php-src/ext/date/lib/timelib.h:1.10.2.11.2.3.2.8 php-src/ext/date/lib/timelib.h:1.10.2.11.2.3.2.9 --- php-src/ext/date/lib/timelib.h:1.10.2.11.2.3.2.8 Tue Jul 15 17:38:27 2008 +++ php-src/ext/date/lib/timelib.h Thu Dec 18 14:55:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: timelib.h,v 1.10.2.11.2.3.2.8 2008/07/15 17:38:27 derick Exp $ */ +/* $Id: timelib.h,v 1.10.2.11.2.3.2.9 2008/12/18 14:55:36 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php