diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-14 00:33:04 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-14 00:33:04 -0700 |
| commit | 100614da271f898384cea4b2b1cead39a0dc8ccd (patch) | |
| tree | ff765841d6aa8dc88b791ed42f05415b5bc81326 /Zend/zend_exceptions.c | |
| parent | c61ceef7796b3967dd5e270245d33ba72ba055ee (diff) | |
| parent | be34c82bfd0ada3804dc2e929e365a70c0a01933 (diff) | |
| download | php-git-100614da271f898384cea4b2b1cead39a0dc8ccd.tar.gz | |
Merge branch 'PHP-5.5.24' into PHP-5.5
* PHP-5.5.24:
fix test
fix memory leak & add test
Fix tests
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Fixed bug #68901 (use after free)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Updated NEWS
Fixed bug #69336 (Issues with "last day of <monthname>").
5.5.24RC1
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 3d73e92c50..f163495906 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); |