diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/standard/assert.c | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/standard/assert.c')
| -rw-r--r-- | ext/standard/assert.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 109ba3ba22..016c90e02e 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -164,7 +164,10 @@ PHP_FUNCTION(assert) if (Z_TYPE_P(assertion) == IS_STRING) { zval retval; int old_error_reporting = 0; /* shut up gcc! */ - zend_class_entry *orig_scope = EG(scope); + + if (zend_forbid_dynamic_call("assert() with string argument") == FAILURE) { + RETURN_FALSE; + } myeval = Z_STRVAL_P(assertion); @@ -194,8 +197,6 @@ PHP_FUNCTION(assert) EG(error_reporting) = old_error_reporting; } - EG(scope) = orig_scope; - convert_to_boolean(&retval); val = Z_TYPE(retval) == IS_TRUE; } else { |