Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
9 years ago · 84b9b164a8
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -48,6 +48,10 @@ PHP                                                                        NEWS
 - PHAR:
  . Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa)

+- SOAP
+  . Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY).
+    (Dmitry)
+
 - Streams:
  . Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara)

--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@ -2623,7 +2623,7 @@ static sdlAttributePtr make_persistent_sdl_attribute(sdlAttributePtr attr, HashT
 		pattr->extraAttributes = malloc(sizeof(HashTable));
 		zend_hash_init(pattr->extraAttributes, zend_hash_num_elements(attr->extraAttributes), NULL, delete_extra_attribute_persistent, 1);

-		ZEND_HASH_FOREACH_STR_KEY_PTR(pattr->extraAttributes, key, tmp) {
+		ZEND_HASH_FOREACH_STR_KEY_PTR(attr->extraAttributes, key, tmp) {
 			if (key) {
 				pextra = malloc(sizeof(sdlExtraAttribute));
 				memset(pextra, 0, sizeof(sdlExtraAttribute));