php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MemorySanitizer: use-of-uninitialized-value warning introduced by 932586c426

Browse Source
This commit is contained in:
Derick Rethans
2022-09-07 16:59:02 +01:00
parent 6af3f5d514
commit 8cdfffb753
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/date/php_date.c
+11 -7
View File
@@ -2263,17 +2263,20 @@ PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object) /* {{{ */
/* Helper function used to store the latest found warnings and errors while
* parsing, from either strtotime or parse_from_format. */
static void update_errors_warnings(timelib_error_container *last_errors) /* {{{ */
static timelib_error_container* update_errors_warnings(timelib_error_container **last_errors) /* {{{ */
{
if (DATEG(last_errors)) {
timelib_error_container_dtor(DATEG(last_errors));
DATEG(last_errors) = NULL;
}
if (last_errors->warning_count || last_errors->error_count) {
DATEG(last_errors) = last_errors;
} else {
timelib_error_container_dtor(last_errors);
if ((*last_errors)->warning_count || (*last_errors)->error_count) {
DATEG(last_errors) = *last_errors;
return *last_errors;
}
timelib_error_container_dtor(*last_errors);
return NULL;
} /* }}} */
static void php_date_set_time_fraction(timelib_time *time, int microseconds)
@@ -2324,7 +2327,7 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
}
/* update last errors and warnings */
update_errors_warnings(err);
err = update_errors_warnings(&err);
/* If called from a constructor throw an exception */
if ((flags & PHP_DATE_INIT_CTOR) && err && err->error_count) {
@@ -3002,7 +3005,8 @@ static bool php_date_modify(zval *object, char *modify, size_t modify_len) /* {{
tmp_time = timelib_strtotime(modify, modify_len, &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
/* update last errors and warnings */
update_errors_warnings(err);
err = update_errors_warnings(&err);
if (err && err->error_count) {
/* spit out the first library error message, at least */
php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", modify,