Merge branch 'PHP-5.6' into PHP-7.0

dstogov · dstogov · commit 04526093e4af · 2015-11-12T20:36:39.000+03:00
* PHP-5.6:
  Fixed bug #70900 (SoapClient systematic out of memory error)
diff --git a/NEWS b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #70898, #70895 (null ptr deref and segfault with crafted callable).
     (Anatol, Laruence)
 
+- SOAP:
+  . Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry)
+
 - Streams/Socket
   . Add IPV6_V6ONLY constant / make it usable in stream contexts. (Bob)
 
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -1149,7 +1149,9 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri)
 					zend_hash_init(ctx.sdl->bindings, 0, NULL, delete_binding, 0);
 				}
 
-				zend_hash_str_add_ptr(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding);
+				if (!zend_hash_str_add_ptr(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding)) {
+					zend_hash_next_index_insert_ptr(ctx.sdl->bindings, tmpbinding);
+				}
 				trav= trav->next;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,9 @@ static sdlPtr load_wsdl(zval this_ptr, char struri)`
`1149`	`1149`	`zend_hash_init(ctx.sdl->bindings, 0, NULL, delete_binding, 0);`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`		`- zend_hash_str_add_ptr(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding);`
	`1152`	`+ if (!zend_hash_str_add_ptr(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), tmpbinding)) {`
	`1153`	`+ zend_hash_next_index_insert_ptr(ctx.sdl->bindings, tmpbinding);`
	`1154`	`+ }`
`1153`	`1155`	`trav= trav->next;`
`1154`	`1156`	`}`
`1155`	`1157`