Skip to content

Commit e629be7

Browse files
committed
Fix a crash bug in assert
1 parent 3f8c890 commit e629be7

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

ext/standard/assert.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@ static PHP_INI_MH(OnChangeCallback)
5454
{
5555
if (ASSERTG(callback)) {
5656
zval_ptr_dtor(&ASSERTG(callback));
57-
} else {
58-
MAKE_STD_ZVAL(ASSERTG(callback));
5957
}
6058

61-
if (new_value)
62-
ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1)
63-
else
64-
ZVAL_EMPTY_STRING(ASSERTG(callback))
59+
MAKE_STD_ZVAL(ASSERTG(callback));
60+
61+
if (new_value) {
62+
ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1);
63+
} else {
64+
ZVAL_EMPTY_STRING(ASSERTG(callback));
65+
}
6566

6667
return SUCCESS;
6768
}

0 commit comments

Comments
 (0)