ext/soap: SoapServer::addSoapHeader() does not need bailout handler wrapper

Girgias · Girgias · commit eab4765675c5 · 2024-06-16T23:05:31.000+01:00
As this methods never uses the bailout mechanism
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -1720,13 +1720,10 @@ PHP_METHOD(SoapServer, addSoapHeader)
 		RETURN_THROWS();
 	}
 
-	SOAP_SERVER_BEGIN_CODE();
-
-	FETCH_THIS_SERVICE(service);
+	FETCH_THIS_SERVICE_NO_BAILOUT(service);
 
 	if (!service || !service->soap_headers_ptr) {
 		zend_throw_error(NULL, "SoapServer::addSoapHeader() may be called only during SOAP request processing");
-		SOAP_SERVER_END_CODE();
 		RETURN_THROWS();
 	}
 
@@ -1738,8 +1735,6 @@ PHP_METHOD(SoapServer, addSoapHeader)
 	memset(*p, 0, sizeof(soapHeader));
 	ZVAL_NULL(&(*p)->function_name);
 	ZVAL_OBJ_COPY(&(*p)->retval, Z_OBJ_P(fault));
-
-	SOAP_SERVER_END_CODE();
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1720,13 +1720,10 @@ PHP_METHOD(SoapServer, addSoapHeader)`
`1720`	`1720`	`RETURN_THROWS();`
`1721`	`1721`	`}`
`1722`	`1722`
`1723`		`- SOAP_SERVER_BEGIN_CODE();`
`1724`		`-`
`1725`		`- FETCH_THIS_SERVICE(service);`
	`1723`	`+ FETCH_THIS_SERVICE_NO_BAILOUT(service);`
`1726`	`1724`
`1727`	`1725`	`if (!service \|\| !service->soap_headers_ptr) {`
`1728`	`1726`	`zend_throw_error(NULL, "SoapServer::addSoapHeader() may be called only during SOAP request processing");`
`1729`		`- SOAP_SERVER_END_CODE();`
`1730`	`1727`	`RETURN_THROWS();`
`1731`	`1728`	`}`
`1732`	`1729`
`@@ -1738,8 +1735,6 @@ PHP_METHOD(SoapServer, addSoapHeader)`
`1738`	`1735`	`memset(*p, 0, sizeof(soapHeader));`
`1739`	`1736`	`ZVAL_NULL(&(*p)->function_name);`
`1740`	`1737`	`ZVAL_OBJ_COPY(&(*p)->retval, Z_OBJ_P(fault));`
`1741`		`-`
`1742`		`- SOAP_SERVER_END_CODE();`
`1743`	`1738`	`}`
`1744`	`1739`	`/* }}} */`
`1745`	`1740`