diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-14 01:20:31 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-14 01:28:06 -0700 |
| commit | b3709bfc52fa60acef1376dbff9ec09f52ed8a5a (patch) | |
| tree | bff6fc91f50d11fcf9e4f6c3f6a9321aca3a305d /Zend/zend_exceptions.c | |
| parent | cddb5eb3e9ff3af9fdff8b849bae67e4d3c7bd03 (diff) | |
| parent | 5776fceb16597d9ce686a01c1b72eac155b9741b (diff) | |
| download | php-git-b3709bfc52fa60acef1376dbff9ec09f52ed8a5a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
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)
...
Conflicts:
Zend/zend_exceptions.c
ext/curl/interface.c
ext/dom/document.c
ext/fileinfo/libmagic/softmagic.c
ext/gd/gd.c
ext/hash/hash.c
ext/pgsql/pgsql.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/standard/http_fopen_wrapper.c
ext/standard/link.c
ext/standard/streamsfuncs.c
ext/xmlwriter/php_xmlwriter.c
ext/zlib/zlib.c
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 6eccc89723..cda0dd943c 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -557,6 +557,9 @@ ZEND_METHOD(exception, getTraceAsString) DEFAULT_0_PARAMS; trace = zend_read_property(base_exception_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv); + if(Z_TYPE_P(trace) != IS_ARRAY) { + RETURN_FALSE; + } ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) { if (Z_TYPE_P(frame) != IS_ARRAY) { zend_error(E_WARNING, "Expected array for frame %pu", index); |