diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-27 16:56:17 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-27 16:56:17 +0800 |
| commit | 122cc5f495b46e8d85a98ee7c25500c4cef4ced1 (patch) | |
| tree | 4ca47423b68d42c54ad1db681371c3954a66316e /Zend/zend.c | |
| parent | 95320f1f468f7576c3536f42d5c03e118e45be23 (diff) | |
| parent | 054917619af45870602b3ee669c86397b8162bda (diff) | |
| download | php-git-122cc5f495b46e8d85a98ee7c25500c4cef4ced1.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 19401d2e03..e8a6a40ff6 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -319,6 +319,7 @@ ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int in { zval expr_copy; int use_copy; + int ret; zend_make_printable_zval(expr, &expr_copy, &use_copy); if (use_copy) { @@ -331,10 +332,11 @@ ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int in return 0; } write_func(Z_STRVAL_P(expr), Z_STRLEN_P(expr)); + ret = Z_STRLEN_P(expr); if (use_copy) { zval_dtor(expr); } - return Z_STRLEN_P(expr); + return ret; } /* }}} */ @@ -366,7 +368,7 @@ ZEND_API void zend_print_flat_zval_r(zval *expr TSRMLS_DC) /* {{{ */ zend_printf("%s Object (", "Unknown Class"); } if (class_name) { - efree((char*)class_name); + STR_RELEASE(class_name); } if (Z_OBJ_HANDLER_P(expr, get_properties)) { properties = Z_OBJPROP_P(expr); |