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

Merge branch 'PHP-8.1'

Browse Source
This commit is contained in:
Derick Rethans
2022-05-27 14:44:41 +01:00
parent e59bb88b7f 38669f5df3
commit 1400aa4fb5
2 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/date/php_date.c
View File

@@ -3486,6 +3486,12 @@ static bool timezone_initialize(php_timezone_obj *tzobj, const char *tz, size_t
dummy_t->z = timelib_parse_zone(&tz, &dst, dummy_t, &not_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
dummy_t->dst = dst;
if (!not_found && (*tz != '\0')) {
php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);
timelib_free(dummy_t->tz_abbr);
efree(dummy_t);
return FAILURE;
}
if (not_found) {
php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);
efree(dummy_t);

73
ext/date/tests/bug78139.phpt Normal file
View File

@@ -0,0 +1,73 @@
--TEST--
Bug #78139 (timezone_open accepts invalid timezone string argument)
--FILE--
<?php
$strings = [
"x",
"x UTC",
"xx UTC",
"xUTC",
"UTCx",
"UTC xx",
];
foreach ($strings as $string)
{
echo "Parsing '{$string}':\n";
$tz = timezone_open($string);
var_dump($tz);
try {
$tz = new \DateTimeZone($string);
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
echo "\n\n";
}
?>
--EXPECTF--
Parsing 'x':
object(DateTimeZone)#1 (2) {
["timezone_type"]=>
int(2)
["timezone"]=>
string(1) "X"
}
Parsing 'x UTC':
Warning: timezone_open(): Unknown or bad timezone (x UTC) in %sbug78139.php on line %d
bool(false)
DateTimeZone::__construct(): Unknown or bad timezone (x UTC)
Parsing 'xx UTC':
Warning: timezone_open(): Unknown or bad timezone (xx UTC) in %sbug78139.php on line %d
bool(false)
DateTimeZone::__construct(): Unknown or bad timezone (xx UTC)
Parsing 'xUTC':
Warning: timezone_open(): Unknown or bad timezone (xUTC) in %sbug78139.php on line %d
bool(false)
DateTimeZone::__construct(): Unknown or bad timezone (xUTC)
Parsing 'UTCx':
Warning: timezone_open(): Unknown or bad timezone (UTCx) in %sbug78139.php on line %d
bool(false)
DateTimeZone::__construct(): Unknown or bad timezone (UTCx)
Parsing 'UTC xx':
Warning: timezone_open(): Unknown or bad timezone (UTC xx) in %sbug78139.php on line %d
bool(false)
DateTimeZone::__construct(): Unknown or bad timezone (UTC xx)