diff options
| author | Nuno Lopes <nlopess@php.net> | 2006-07-01 12:21:07 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2006-07-01 12:21:07 +0000 |
| commit | b7311e91737d0635736031643291d3ec0902d38c (patch) | |
| tree | 82a219758a778444d963f5a7f0d6e6c1706a53dd /ext/standard/assert.c | |
| parent | 7961207d6bc39ece1401f3615ee0375766cc9f06 (diff) | |
| download | php-git-b7311e91737d0635736031643291d3ec0902d38c.tar.gz | |
fixed segfaults and such things within the new assert02.phpt test
Diffstat (limited to 'ext/standard/assert.c')
| -rw-r--r-- | ext/standard/assert.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 7e9159a8b4..b123f09b1a 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -152,7 +152,10 @@ PHP_FUNCTION(assert) 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); |