php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains timezone).

Browse Source
This commit is contained in:
Adam Harvey
2010-03-26 04:31:26 +00:00
parent 252082192a
commit 53cfb3d53d
6 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+2
View File
@@ -9,6 +9,8 @@ PHP NEWS
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains
timezone). (Adam)
- Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is
on). (Ilia, j dot jeising at gmail dot com)
- Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
ext/date/lib/parse_date.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Sun Mar 7 18:37:37 2010 */
/* Generated by re2c 0.13.5 on Fri Mar 26 12:00:44 2010 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -526,7 +526,7 @@ static long timelib_parse_tz_cor(char **ptr)
char *begin = *ptr, *end;
long tmp;
while (**ptr != '\0') {
while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;
ext/date/lib/parse_date.re
+1 -1
View File
@@ -524,7 +524,7 @@ static long timelib_parse_tz_cor(char **ptr)
char *begin = *ptr, *end;
long tmp;
while (**ptr != '\0') {
while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;
ext/date/lib/parse_iso_intervals.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Sun Mar 7 14:12:01 2010 */
/* Generated by re2c 0.13.5 on Fri Mar 26 12:12:03 2010 */
#line 1 "ext/date/lib/parse_iso_intervals.re"
/*
+----------------------------------------------------------------------+
@@ -183,7 +183,7 @@ static long timelib_parse_tz_cor(char **ptr)
char *begin = *ptr, *end;
long tmp;
while (**ptr != '\0') {
while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;
ext/date/lib/parse_iso_intervals.re
+1 -1
View File
@@ -181,7 +181,7 @@ static long timelib_parse_tz_cor(char **ptr)
char *begin = *ptr, *end;
long tmp;
while (**ptr != '\0') {
while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;
ext/date/tests/bug51393.phpt
+73
View File
@@ -0,0 +1,73 @@
--TEST--
Bug #51393 (DateTime::createFromFormat() fails if format string contains timezone)
--FILE--
<?php
$dt = DateTime::createFromFormat('O', '+0800');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('P', '+08:00');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('O', '-0800');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('P', '-08:00');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[O]', '[+0800]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[P]', '[+08:00]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[O]', '[-0800]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[P]', '[-08:00]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('O', 'GMT+0800');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('P', 'GMT+08:00');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('O', 'GMT-0800');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('P', 'GMT-08:00');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[O]', '[GMT+0800]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[P]', '[GMT+08:00]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[O]', '[GMT-0800]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('[P]', '[GMT-08:00]');
var_dump($dt->getOffset());
$dt = DateTime::createFromFormat('O', 'invalid');
var_dump($dt);
?>
--EXPECT--
int(28800)
int(28800)
int(-28800)
int(-28800)
int(28800)
int(28800)
int(-28800)
int(-28800)
int(28800)
int(28800)
int(-28800)
int(-28800)
int(28800)
int(28800)
int(-28800)
int(-28800)
bool(false)