Fixed bug #46427 (SoapClient() stumbles over its "stream_context" parameter)

dstogov · dstogov · commit f80d26e68ac1 · 2008-11-27T11:25:40.000Z
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2522,6 +2522,7 @@ PHP_METHOD(SoapClient, SoapClient)
 		if (zend_hash_find(ht, "stream_context", sizeof("stream_context"), (void**)&tmp) == SUCCESS &&
 				Z_TYPE_PP(tmp) == IS_RESOURCE) {
 			context = php_stream_context_from_zval(*tmp, 1);
+			zend_list_addref(context->rsrc_id);
 		}
 
 		if (zend_hash_find(ht, "location", sizeof("location"), (void**)&tmp) == SUCCESS &&
diff --git a/ext/soap/tests/bugs/bug46427.phpt b/ext/soap/tests/bugs/bug46427.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #46427 (SoapClient() stumbles over its "stream_context" parameter)
+--FILE--
+<?php
+error_reporting(E_ALL|E_STRICT);
+
+function getSoapClient_1() {
+    $ctx = stream_context_create();
+    return new SoapClient(NULL, array(
+    	'stream_context' => $ctx,
+    	'location' => 'test://',
+    	'uri' => 'test://',
+    	'exceptions' => false));
+}
+
+getSoapClient_1()->__soapCall('Help', array());
+echo "ok\n";
+?>
+--EXPECT--
+ok

Original file line number	Diff line number	Diff line change
`@@ -2522,6 +2522,7 @@ PHP_METHOD(SoapClient, SoapClient)`
`2522`	`2522`	`if (zend_hash_find(ht, "stream_context", sizeof("stream_context"), (void**)&tmp) == SUCCESS &&`
`2523`	`2523`	`Z_TYPE_PP(tmp) == IS_RESOURCE) {`
`2524`	`2524`	`context = php_stream_context_from_zval(*tmp, 1);`
	`2525`	`+ zend_list_addref(context->rsrc_id);`
`2525`	`2526`	`}`
`2526`	`2527`
`2527`	`2528`	`if (zend_hash_find(ht, "location", sizeof("location"), (void**)&tmp) == SUCCESS &&`