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

diff --git a/NEWS b/NEWS
index d432332a26ef48cf0598b8059b5f5ffebee31553..8a141e314a7dc23be09c09a128375f93fd48bde0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 7cd3e5f45ca3221deb79bd04abfe1e4238cac641..3d76fa8b981be6c8a80950256c5a78911d664ed1 100644 (file)
--- 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 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;

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 59feef9eb37695e866379ef78cbb441aa2eeaf81..4eae69376b9a52a89b416312aab49ff7fab8b019 100644 (file)
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -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;

diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c
index cc58f1dc60be779841ac73cef9b088d49d18a20e..a08dcc4b56aa14c9b07f342e6a63b93f5bf7d1c3 100644 (file)
--- a/ext/date/lib/parse_iso_intervals.c
+++ b/ext/date/lib/parse_iso_intervals.c
@@ -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;

diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re
index eb861a1a6b3a5ba0b70440c07e043f2c0cce86f0..bf2c287276f35b852940e0867688f7c41f35c43c 100644 (file)
--- a/ext/date/lib/parse_iso_intervals.re
+++ b/ext/date/lib/parse_iso_intervals.re
@@ -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;

diff --git a/ext/date/tests/bug51393.phpt b/ext/date/tests/bug51393.phpt
new file mode 100644 (file)
index 0000000..c4c4d61
--- /dev/null
+++ b/ext/date/tests/bug51393.phpt
@@ -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)