mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #54316 (DateTime::createFromFormat does not handle trailing '|'

Browse Source 
correctly).
This commit is contained in:
Adam Harvey 2011-03-21 09:40:52 +00:00
parent 95a3bfb1bc
commit 68811c473d
4 changed files with 32799 additions and 18198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -9,6 +9,10 @@ PHP NEWS
. Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
(tomas dot brastavicius at quantum dot lt, Pierrick)
- DateTime extension:
. Fixed bug #54316 (DateTime::createFromFormat does not handle trailing '|'
correctly). (Adam)
- DBA extension:
. Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)

50908
ext/date/lib/parse_date.c
View File

File diff suppressed because it is too large Load Diff

57
ext/date/lib/parse_date.re
View File

@ -23,6 +23,7 @@
#include <stdio.h>
#include <ctype.h>
#include <math.h>
#include <assert.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@ -1822,6 +1823,30 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container
add_pbf_error(s, "Unexpected data found.", string, begin); \
}
void timelib_time_reset_fields(timelib_time *time)
{
assert(time != NULL);
time->y = 1970;
time->m = 1;
time->d = 1;
time->h = time->i = time->s = 0;
time->f = 0.0;
time->tz_info = NULL;
}
void timelib_time_reset_unset_fields(timelib_time *time)
{
assert(time != NULL);
if (time->y == TIMELIB_UNSET ) time->y = 1970;
if (time->m == TIMELIB_UNSET ) time->m = 1;
if (time->d == TIMELIB_UNSET ) time->d = 1;
if (time->h == TIMELIB_UNSET ) time->h = 0;
if (time->i == TIMELIB_UNSET ) time->i = 0;
if (time->s == TIMELIB_UNSET ) time->s = 0;
if (time->f == TIMELIB_UNSET ) time->f = 0.0;
}
timelib_time *timelib_parse_from_format(char *format, char *string, int len, timelib_error_container **errors, const timelib_tzdb *tzdb)
{
@ -2020,23 +2045,11 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
break;
case '!': /* reset all fields to default */
s->time->y = 1970;
s->time->m = 1;
s->time->d = 1;
s->time->h = s->time->i = s->time->s = 0;
s->time->f = 0.0;
s->time->tz_info = NULL;
timelib_time_reset_fields(s->time);
break; /* break intentionally not missing */
case '|': /* reset all fields to default when not set */
if (s->time->y == TIMELIB_UNSET ) s->time->y = 1970;
if (s->time->m == TIMELIB_UNSET ) s->time->m = 1;
if (s->time->d == TIMELIB_UNSET ) s->time->d = 1;
if (s->time->h == TIMELIB_UNSET ) s->time->h = 0;
if (s->time->i == TIMELIB_UNSET ) s->time->i = 0;
if (s->time->s == TIMELIB_UNSET ) s->time->s = 0;
if (s->time->f == TIMELIB_UNSET ) s->time->f = 0.0;
timelib_time_reset_unset_fields(s->time);
break; /* break intentionally not missing */
case '?': /* random char */
@ -2068,7 +2081,21 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
add_pbf_error(s, "Trailing data", string, ptr);
}
if (*fptr) {
add_pbf_error(s, "Data missing", string, ptr);
/* Trailing | and ! specifiers are valid. */
while (*fptr) {
switch (*fptr++) {
case '!': /* reset all fields to default */
timelib_time_reset_fields(s->time);
break;
case '|': /* reset all fields to default when not set */
timelib_time_reset_unset_fields(s->time);
break;
default:
add_pbf_error(s, "Data missing", string, ptr);
}
}
}
/* clean up a bit */

28
ext/date/tests/bug54316.phpt Normal file
View File

@ -0,0 +1,28 @@
--TEST--
Bug #54316 (DateTime::createFromFormat does not handle trailing '|' correctly)
--INI--
date.timezone=UTC
--FILE--
<?php
$dt = DateTime::createFromFormat('Y-m-d|', '2011-02-02');
var_dump($dt);
$dt = DateTime::createFromFormat('Y-m-d!', '2011-02-02');
var_dump($dt);
--EXPECT--
object(DateTime)#1 (3) {
["date"]=>
string(19) "2011-02-02 00:00:00"
["timezone_type"]=>
int(3)
["timezone"]=>
string(3) "UTC"
}
object(DateTime)#2 (3) {
["date"]=>
string(19) "1970-01-01 00:00:00"
["timezone_type"]=>
int(3)
["timezone"]=>
string(3) "UTC"
}