@@ -2263,8 +2263,9 @@ PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object) /* {{{ */
2263
2263
2264
2264
/* Helper function used to store the latest found warnings and errors while
2265
2265
* parsing, from either strtotime or parse_from_format. */
2266
- static void update_errors_warnings (timelib_error_container * last_errors ) /* {{{ */
2266
+ static void update_errors_warnings (timelib_error_container * * last_errors_ptr ) /* {{{ */
2267
2267
{
2268
+ timelib_error_container * last_errors = * last_errors_ptr ;
2268
2269
if (DATEG (last_errors )) {
2269
2270
timelib_error_container_dtor (DATEG (last_errors ));
2270
2271
DATEG (last_errors ) = NULL ;
@@ -2273,6 +2274,7 @@ static void update_errors_warnings(timelib_error_container *last_errors) /* {{{
2273
2274
DATEG (last_errors ) = last_errors ;
2274
2275
} else {
2275
2276
timelib_error_container_dtor (last_errors );
2277
+ * last_errors_ptr = NULL ;
2276
2278
}
2277
2279
} /* }}} */
2278
2280
@@ -2324,7 +2326,7 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
2324
2326
}
2325
2327
2326
2328
/* update last errors and warnings */
2327
- update_errors_warnings (err );
2329
+ update_errors_warnings (& err );
2328
2330
2329
2331
/* If called from a constructor throw an exception */
2330
2332
if ((flags & PHP_DATE_INIT_CTOR ) && err && err -> error_count ) {
@@ -3002,7 +3004,7 @@ static bool php_date_modify(zval *object, char *modify, size_t modify_len) /* {{
3002
3004
tmp_time = timelib_strtotime (modify , modify_len , & err , DATE_TIMEZONEDB , php_date_parse_tzfile_wrapper );
3003
3005
3004
3006
/* update last errors and warnings */
3005
- update_errors_warnings (err );
3007
+ update_errors_warnings (& err );
3006
3008
if (err && err -> error_count ) {
3007
3009
/* spit out the first library error message, at least */
3008
3010
php_error_docref (NULL , E_WARNING , "Failed to parse time string (%s) at position %d (%c): %s" , modify ,
0 commit comments