Fix redundant ZSTR_VAL condition in php_date.c (#8753)

iluuu1994 · web-flow · commit e79046fbe49c · 2022-06-12T10:59:37.000+02:00
ZSTR_VAL can never be NULL as zend_string.val is a char[1] which will
always decay to a non-nullable pointer.

This fails with -Werror on newer gcc versions.
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -477,7 +477,7 @@ timelib_tzinfo *php_date_parse_tzfile_wrapper(const char *formal_tzname, const t
 /* {{{ static PHP_INI_MH(OnUpdate_date_timezone) */
 static PHP_INI_MH(OnUpdate_date_timezone)
 {
-	if (new_value && ZSTR_VAL(new_value) && !timelib_timezone_id_is_valid(ZSTR_VAL(new_value), DATE_TIMEZONEDB)) {
+	if (new_value && !timelib_timezone_id_is_valid(ZSTR_VAL(new_value), DATE_TIMEZONEDB)) {
 		php_error_docref(
 			NULL, E_WARNING,
 			"Invalid date.timezone value '%s', using '%s' instead",

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ timelib_tzinfo php_date_parse_tzfile_wrapper(const char formal_tzname, const t`
`477`	`477`	`/* {{{ static PHP_INI_MH(OnUpdate_date_timezone) */`
`478`	`478`	`static PHP_INI_MH(OnUpdate_date_timezone)`
`479`	`479`	`{`
`480`		`- if (new_value && ZSTR_VAL(new_value) && !timelib_timezone_id_is_valid(ZSTR_VAL(new_value), DATE_TIMEZONEDB)) {`
	`480`	`+ if (new_value && !timelib_timezone_id_is_valid(ZSTR_VAL(new_value), DATE_TIMEZONEDB)) {`
`481`	`481`	`php_error_docref(`
`482`	`482`	`NULL, E_WARNING,`
`483`	`483`	`"Invalid date.timezone value '%s', using '%s' instead",`