diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-05 17:30:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-11 16:53:22 -0700 |
| commit | a894a8155fab068d68a04bf181dbaddfa01ccbb0 (patch) | |
| tree | 0e1727890ce41a0ad60b8d9fdb5bebc7908e0ba0 /Zend/zend_exceptions.c | |
| parent | 4435b9142ff9813845d5c97ab29a5d637bedb257 (diff) | |
| download | php-git-a894a8155fab068d68a04bf181dbaddfa01ccbb0.tar.gz | |
More fixes for bug #69152
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index bf90ae7be3..1ca2eadbf4 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -591,6 +591,9 @@ ZEND_METHOD(exception, getTraceAsString) str = &res; trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); + if(Z_TYPE_P(trace) != IS_ARRAY) { + RETURN_FALSE; + } zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num); s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1); |