Fixed bug #77088 (Segfault when using SoapClient with null options)

SoapClient constructor has its own error handler

Author: laruence

NEWS

@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #71041 (zend_signal_startup() needs ZEND_API).
     (Valentin V. Bartenev)
 
+- Soap:
+  . Fixed bug #77088 (Segfault when using SoapClient with null options).
+    (Laruence)
+
 - Sockets:
   . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS).
     (Mizunashi Mana)

ext/soap/soap.c

@@ -1117,8 +1117,8 @@ PHP_METHOD(SoapServer, SoapServer)
 
 	SOAP_SERVER_BEGIN_CODE();
 
-	if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "z|a", &wsdl, &options) == FAILURE) {
-		return;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|a", &wsdl, &options) == FAILURE) {
+		php_error_docref(NULL, E_ERROR, "Invalid parameters");
 	}
 
 	if (Z_TYPE_P(wsdl) != IS_STRING && Z_TYPE_P(wsdl) != IS_NULL) {
@@ -2273,8 +2273,8 @@ PHP_METHOD(SoapClient, SoapClient)
 
 	SOAP_CLIENT_BEGIN_CODE();
 
-	if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "z|a", &wsdl, &options) == FAILURE) {
-		return;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|a", &wsdl, &options) == FAILURE) {
+		php_error_docref(NULL, E_ERROR, "Invalid parameters");
 	}
 
 	if (Z_TYPE_P(wsdl) != IS_STRING && Z_TYPE_P(wsdl) != IS_NULL) {

ext/soap/tests/bug77088.phpt

@@ -0,0 +1,65 @@
+--TEST--
+Bug #77088 (Segfault when using SoapClient with null options)
+--SKIPIF--
+<?php
+	require_once('skipif.inc');
+?>
+--FILE--
+<?php
+
+try
+{
+    $options = NULL;
+    $sClient = new SoapClient("test.wsdl", $options);
+} 
+catch(SoapFault $e)
+{
+    var_dump($e);
+}
+
+?>
+--EXPECTF--
+Warning: SoapClient::SoapClient() expects parameter 2 to be array, null given in %sbug77088.php on line %d
+object(SoapFault)#%d (%d) {
+  ["message":protected]=>
+  string(44) "SoapClient::SoapClient(): Invalid parameters"
+  ["string":"Exception":private]=>
+  string(0) ""
+  ["code":protected]=>
+  int(0)
+  ["file":protected]=>
+  string(%d) "%sbug77088.php"
+  ["line":protected]=>
+  int(6)
+  ["trace":"Exception":private]=>
+  array(1) {
+    [0]=>
+    array(6) {
+      ["file"]=>
+      string(%d) "%sbug77088.php"
+      ["line"]=>
+      int(6)
+      ["function"]=>
+      string(10) "SoapClient"
+      ["class"]=>
+      string(10) "SoapClient"
+      ["type"]=>
+      string(2) "->"
+      ["args"]=>
+      array(2) {
+        [0]=>
+        string(9) "test.wsdl"
+        [1]=>
+        NULL
+      }
+    }
+  }
+  ["previous":"Exception":private]=>
+  NULL
+  ["faultstring"]=>
+  string(44) "SoapClient::SoapClient(): Invalid parameters"
+  ["faultcode"]=>
+  string(6) "Client"
+  ["faultcodens"]=>
+  string(41) "http://schemas.xmlsoap.org/soap/envelope/"
+}