iliaa Wed Aug 13 20:38:21 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard assert.c Log: MFH: Fixed a possible crash due to invalid handling of assert ini options. Index: php-src/ext/standard/assert.c diff -u php-src/ext/standard/assert.c:1.50.2.1 php-src/ext/standard/assert.c:1.50.2.2 --- php-src/ext/standard/assert.c:1.50.2.1 Tue Dec 31 11:35:24 2002 +++ php-src/ext/standard/assert.c Wed Aug 13 20:38:21 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.50.2.1 2002/12/31 16:35:24 sebastian Exp $ */ +/* $Id: assert.c,v 1.50.2.2 2003/08/14 00:38:21 iliaa Exp $ */ /* {{{ includes/startup/misc */ @@ -56,12 +56,9 @@ zval_ptr_dtor(&ASSERTG(callback)); } - MAKE_STD_ZVAL(ASSERTG(callback)); - - if (new_value) { + if (new_value && (ASSERTG(callback) || new_value_length)) { + MAKE_STD_ZVAL(ASSERTG(callback)); ZVAL_STRINGL(ASSERTG(callback), new_value, new_value_length, 1); - } else { - ZVAL_EMPTY_STRING(ASSERTG(callback)); } return SUCCESS; @@ -103,6 +100,7 @@ { if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); + ASSERTG(callback) = NULL; } return SUCCESS; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php