Fixed bug #70900 (SoapClient systematic out of memory error)

dstogov · dstogov · commit f8bf9bd86bde · 2015-11-12T20:31:52.000+03:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2015, PHP 5.6.17
 
+- SOAP:
+  . Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry)
+
 26 Nov 2015, PHP 5.6.16
 
 - Core:
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -1157,7 +1157,9 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri TSRMLS_DC)
 					zend_hash_init(ctx.sdl->bindings, 0, NULL, delete_binding, 0);
 				}
 
-				zend_hash_add(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), &tmpbinding, sizeof(sdlBindingPtr), NULL);
+				if (zend_hash_add(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), &tmpbinding, sizeof(sdlBindingPtr), NULL) != SUCCESS) {
+					zend_hash_next_index_insert(ctx.sdl->bindings, &tmpbinding, sizeof(sdlBindingPtr), NULL);
+				}
 				trav= trav->next;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,9 @@ static sdlPtr load_wsdl(zval this_ptr, char struri TSRMLS_DC)`
`1157`	`1157`	`zend_hash_init(ctx.sdl->bindings, 0, NULL, delete_binding, 0);`
`1158`	`1158`	`}`
`1159`	`1159`
`1160`		`- zend_hash_add(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), &tmpbinding, sizeof(sdlBindingPtr), NULL);`
	`1160`	`+ if (zend_hash_add(ctx.sdl->bindings, tmpbinding->name, strlen(tmpbinding->name), &tmpbinding, sizeof(sdlBindingPtr), NULL) != SUCCESS) {`
	`1161`	`+ zend_hash_next_index_insert(ctx.sdl->bindings, &tmpbinding, sizeof(sdlBindingPtr), NULL);`
	`1162`	`+ }`
`1161`	`1163`	`trav= trav->next;`
`1162`	`1164`	`}`
`1163`	`1165`