tony2001 Wed Jul 12 22:19:12 2006 UTC Modified files: /php-src/ext/standard assert.c Log: fix assert() in Unicode mode http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.66&r2=1.67&diff_format=u Index: php-src/ext/standard/assert.c diff -u php-src/ext/standard/assert.c:1.66 php-src/ext/standard/assert.c:1.67 --- php-src/ext/standard/assert.c:1.66 Sat Jul 1 12:29:38 2006 +++ php-src/ext/standard/assert.c Wed Jul 12 22:19:12 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.66 2006/07/01 12:29:38 nlopess Exp $ */ +/* $Id: assert.c,v 1.67 2006/07/12 22:19:12 tony2001 Exp $ */ /* {{{ includes/startup/misc */ @@ -125,7 +125,8 @@ PHP_FUNCTION(assert) { zval **assertion; - int val; + zval tmp; + int val, free_tmp = 0; char *myeval = NULL; char *compiled_string_description; @@ -139,9 +140,7 @@ if (Z_TYPE_PP(assertion) == IS_STRING || Z_TYPE_PP(assertion) == IS_UNICODE) { zval retval; - zval tmp; int old_error_reporting = 0; /* shut up gcc! */ - int free_tmp = 0; if (Z_TYPE_PP(assertion) == IS_UNICODE) { tmp = **assertion; @@ -167,9 +166,6 @@ } RETURN_FALSE; } - if (free_tmp) { - zval_dtor(&tmp); - } efree(compiled_string_description); if (ASSERTG(quiet_eval)) { @@ -226,6 +222,10 @@ } } + if (free_tmp) { + zval_dtor(&tmp); + } + if (ASSERTG(bail)) { zend_bailout(); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php