diff options
author | Derick Rethans <github@derickrethans.nl> | 2019-02-28 13:52:33 +0000 |
---|---|---|
committer | Derick Rethans <github@derickrethans.nl> | 2019-02-28 13:52:33 +0000 |
commit | 9624e87a8fb4a3ae99bd6ed2cda6bd953ce3d98c (patch) | |
tree | 6e966c8d0bacb756c6acc7816c19469cb0d5c559 /ext/date | |
parent | 9d356bab503c0875d577ab5c19638559549ea9f7 (diff) | |
parent | d63a7aa6cfb549f3462be9f0a05bad80a59d20a0 (diff) | |
download | php-git-9624e87a8fb4a3ae99bd6ed2cda6bd953ce3d98c.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/date')
-rw-r--r-- | ext/date/php_date.c | 13 | ||||
-rw-r--r-- | ext/date/tests/date_interval_create_from_date_string_broken.phpt | 10 | ||||
-rw-r--r-- | ext/date/tests/date_interval_create_from_date_string_nullparam.phpt | 38 |
3 files changed, 24 insertions, 37 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 8bb310f2a7..a882071835 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -4435,12 +4435,21 @@ PHP_FUNCTION(date_interval_create_from_date_string) Z_PARAM_STR(time_str) ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); - php_date_instantiate(date_ce_interval, return_value); - time = timelib_strtotime(ZSTR_VAL(time_str), ZSTR_LEN(time_str), &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); + + if (err->error_count > 0) { + php_error_docref(NULL, E_WARNING, "Unknown or bad format (%s) at position %d (%c): %s", ZSTR_VAL(time_str), + err->error_messages[0].position, err->error_messages[0].character ? err->error_messages[0].character : ' ', err->error_messages[0].message); + RETVAL_FALSE; + goto cleanup; + } + + php_date_instantiate(date_ce_interval, return_value); diobj = Z_PHPINTERVAL_P(return_value); diobj->diff = timelib_rel_time_clone(&time->relative); diobj->initialized = 1; + +cleanup: timelib_time_dtor(time); timelib_error_container_dtor(err); } diff --git a/ext/date/tests/date_interval_create_from_date_string_broken.phpt b/ext/date/tests/date_interval_create_from_date_string_broken.phpt new file mode 100644 index 0000000000..c065de0f8c --- /dev/null +++ b/ext/date/tests/date_interval_create_from_date_string_broken.phpt @@ -0,0 +1,10 @@ +--TEST-- +Test date_interval_create_from_date_string() function : nonsense data +--FILE-- +<?php +$i = date_interval_create_from_date_string("foobar"); +var_dump($i); +?> +--EXPECTF-- +Warning: date_interval_create_from_date_string(): Unknown or bad format (foobar) at position 0 (f): The timezone could not be found in the database in %sdate_interval_create_from_date_string_broken.php on line 2 +bool(false) diff --git a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt index bb7bf94ce2..e03386ad3c 100644 --- a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt +++ b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt @@ -4,41 +4,9 @@ Test date_interval_create_from_date_string() function : null parameter Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --FILE-- <?php -$i = date_interval_create_from_date_string(null); //returns a empty object +$i = date_interval_create_from_date_string(null); var_dump($i); ?> --EXPECTF-- -object(DateInterval)#%d (16) { - ["y"]=> - int(0) - ["m"]=> - int(0) - ["d"]=> - int(0) - ["h"]=> - int(0) - ["i"]=> - int(0) - ["s"]=> - int(0) - ["f"]=> - float(0) - ["weekday"]=> - int(0) - ["weekday_behavior"]=> - int(0) - ["first_last_day_of"]=> - int(0) - ["invert"]=> - int(0) - ["days"]=> - int(0) - ["special_type"]=> - int(0) - ["special_amount"]=> - int(0) - ["have_weekday_relative"]=> - int(0) - ["have_special_relative"]=> - int(0) -} +Warning: date_interval_create_from_date_string(): Unknown or bad format () at position 0 ( ): Empty string in %sdate_interval_create_from_date_string_nullparam.php on line 2 +bool(false) |