cvs: php-src(PHP_5_2) /ext/standard assert.c /ext/standard/tests/assert assert02.phpt
| From: | Nuno Lopes | Date: | Sat, 01 Jul 2006 12:21:07 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard assert.c /ext/standard/tests/assert assert02.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39011@lists.php.net to get a copy of this message | ||
nlopess Sat Jul 1 12:21:07 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/assert assert02.phpt
Modified files:
/php-src/ext/standard assert.c
Log:
fixed segfaults and such things within the new assert02.phpt test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.60.2.3.2.1&r2=1.60.2.3.2.2&diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.60.2.3.2.1 php-src/ext/standard/assert.c:1.60.2.3.2.2
--- php-src/ext/standard/assert.c:1.60.2.3.2.1 Fri Jun 23 11:37:53 2006
+++ php-src/ext/standard/assert.c Sat Jul 1 12:21:07 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.60.2.3.2.1 2006/06/23 11:37:53 iliaa Exp $ */
+/* $Id: assert.c,v 1.60.2.3.2.2 2006/07/01 12:21:07 nlopess Exp $ */
/* {{{ includes/startup/misc */
@@ -152,7 +152,10 @@
if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
efree(compiled_string_description);
php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Failure evaluating code: %s%s",
PHP_EOL, myeval);
- /* php_error_docref() does not return in this case. */
+ if (ASSERTG(bail)) {
+ zend_bailout();
+ }
+ RETURN_FALSE;
}
efree(compiled_string_description);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/assert/assert02.phpt
+++ php-src/ext/standard/tests/assert/assert02.phpt