diff options
| author | Xinchen Hui <laruence@php.net> | 2012-02-25 04:36:08 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-02-25 04:36:08 +0000 |
| commit | 1ee93c83ff7278f09be64b496a208a1c453f8b7c (patch) | |
| tree | a05de9839c96a51f85b19b309df06fed3c26af5e /Zend/zend_API.c | |
| parent | bcefc31e68883448673c69ad9de6179d66db9c5b (diff) | |
| download | php-git-1ee93c83ff7278f09be64b496a208a1c453f8b7c.tar.gz | |
Fixed bug #61165 (Segfault - strip_tags())
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 0abab07172..3b87145e6c 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -254,10 +254,15 @@ ZEND_API int zend_get_object_classname(const zval *object, char **class_name, ze static int parse_arg_object_to_string(zval **arg TSRMLS_DC) /* {{{ */ { if (Z_OBJ_HANDLER_PP(arg, cast_object)) { - SEPARATE_ZVAL_IF_NOT_REF(arg); - if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING TSRMLS_CC) == SUCCESS) { + zval *obj; + ALLOC_ZVAL(obj); + MAKE_COPY_ZVAL(arg, obj); + if (Z_OBJ_HANDLER_P(*arg, cast_object)(*arg, obj, IS_STRING TSRMLS_CC) == SUCCESS) { + zval_ptr_dtor(arg); + *arg = obj; return SUCCESS; } + zval_ptr_dtor(&obj); } /* Standard PHP objects */ if (Z_OBJ_HT_PP(arg) == &std_object_handlers || !Z_OBJ_HANDLER_PP(arg, cast_object)) { |