diff options
| author | Derick Rethans <derick@php.net> | 2008-12-18 14:55:36 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2008-12-18 14:55:36 +0000 |
| commit | aea378c91c4a4f4a77fcbef0f0c577e5b2a0486c (patch) | |
| tree | b6155d810fd590532349df87a9bdcbcad5687e43 /ext/date/lib/parse_date.c | |
| parent | 47769245adf76978e3e1ba46be3e581c287f19c3 (diff) | |
| download | php-git-aea378c91c4a4f4a77fcbef0f0c577e5b2a0486c.tar.gz | |
- MFH: Fixed bug #46889: Memory leak in strtotime().
Diffstat (limited to 'ext/date/lib/parse_date.c')
| -rw-r--r-- | ext/date/lib/parse_date.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 8a2f34a247..f99e6ff59c 100644 --- 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 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" /* +----------------------------------------------------------------------+ @@ -24232,7 +24232,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim 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 @@ 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; |