From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 15 May 2014 08:29:52 +0000 (+0400)
Subject: Fixed destructive assignment
X-Git-Tag: POST_PHPNG_MERGE~361^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d2b1753393b78c37755a54be113d9201ad5359d;p=php

Fixed destructive assignment
---

diff --git a/ext/soap/php_packet_soap.c b/ext/soap/php_packet_soap.c
index ce505b4333..07bda29e5d 100644
--- a/ext/soap/php_packet_soap.c
+++ b/ext/soap/php_packet_soap.c
@@ -380,9 +380,13 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction
 
 			zend_hash_internal_pointer_reset(Z_ARRVAL_P(return_value));
 			tmp = zend_hash_get_current_data(Z_ARRVAL_P(return_value));
-			if (Z_REFCOUNTED_P(tmp)) Z_ADDREF_P(tmp);
-			zval_dtor(return_value);
-			ZVAL_COPY_VALUE(return_value, tmp);
+			if (!Z_REFCOUNTED_P(return_value)) {
+				ZVAL_COPY_VALUE(return_value, tmp);
+			} else {
+				zend_refcounted *garbage = Z_COUNTED_P(return_value);
+				ZVAL_COPY(return_value, tmp);
+				_zval_dtor_func(garbage ZEND_FILE_LINE_CC);
+			}
 		}
 	}