php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20011: Array of SoapVar of unknown type causes crash
This commit is contained in:
Niels Dossche
2025-10-02 19:39:44 +02:00
parent 010e178a40 19f345c824
commit 7f9b6a8c2a
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/soap/php_encoding.c
View File

@@ -3579,6 +3579,11 @@ static encodePtr get_array_type(xmlNodePtr node, zval *array, smart_str *type)
soap_error0(E_ERROR, "Encoding: SoapVar has no 'enc_type' property");
}
cur_type = Z_LVAL_P(ztype);
if (cur_type == UNKNOWN_TYPE) {
/* Mimic guess_xml_convert() where we use the type of the data.
* UNDEFs are handled transparently as it will error out upon encoding the data. */
cur_type = Z_TYPE_P(Z_VAR_ENC_VALUE_P(tmp));
}
zval *zstype = Z_VAR_ENC_STYPE_P(tmp);
if (Z_TYPE_P(zstype) == IS_STRING) {

20
ext/soap/tests/bugs/gh20011.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
GH-20011 (Array of SoapVar of unknown type causes crash)
--EXTENSIONS--
soap
--FILE--
<?php
class TestSoapClient extends SoapClient {
public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): ?string {
die($request);
}
}
$array = [new SoapVar('test string', NULL)];
$client = new TestSoapClient(NULL, ['location' => 'test://', 'uri' => 'http://soapinterop.org/']);
$client->echoStringArray($array);
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoStringArray><param0 SOAP-ENC:arrayType="xsd:string[1]" xsi:type="SOAP-ENC:Array"><item xsi:type="xsd:string">test string</item></param0></ns1:echoStringArray></SOAP-ENV:Body></SOAP-ENV:Envelope>