diff options
| -rw-r--r-- | Zend/zend_exceptions.c | 7 | ||||
| -rw-r--r-- | ext/phar/phar.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 3e50422e4b..f7eac9212c 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -587,13 +587,14 @@ ZEND_METHOD(exception, getTraceAsString) DEFAULT_0_PARAMS; - res = estrdup(""); - 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; } + + res = estrdup(""); + str = &res; + 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); diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 2f2c4d35f6..a861a03464 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -606,7 +606,8 @@ int phar_parse_metadata(char **buffer, zval **metadata, php_uint32 zip_metadata_ php_unserialize_data_t var_hash; if (zip_metadata_len) { - const unsigned char *p, *p_buff = estrndup(*buffer, zip_metadata_len); + const unsigned char *p; + unsigned char *p_buff = (unsigned char *)estrndup(*buffer, zip_metadata_len); p = p_buff; ALLOC_ZVAL(*metadata); INIT_ZVAL(**metadata); |