diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-04 16:48:13 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-04 16:48:13 +0100 |
| commit | b6f518381676be23369579aed56d5cbad997ac87 (patch) | |
| tree | daf004e7a03973695f99c5c79b996053aed67b26 /ext/soap | |
| parent | 424d5a60dd0f562978479dd7e46bf72b469d9775 (diff) | |
| parent | 579d76d87b7ef3d8d2a084712f95bc9476919c72 (diff) | |
| download | php-git-b6f518381676be23369579aed56d5cbad997ac87.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/php_sdl.c | 2 | ||||
| -rw-r--r-- | ext/soap/tests/bugs/bug76348.phpt | 15 | ||||
| -rw-r--r-- | ext/soap/tests/bugs/bug76348.wsdl | 87 |
3 files changed, 103 insertions, 1 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 2cc46b7387..8ab82d0900 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2448,7 +2448,7 @@ static HashTable* make_persistent_sdl_function_headers(HashTable *headers, HashT pheader->ns = strdup(pheader->ns); } - if (pheader->encode->details.sdl_type) { + if (pheader->encode && pheader->encode->details.sdl_type) { if ((penc = zend_hash_str_find_ptr(ptr_map, (char*)&pheader->encode, sizeof(encodePtr))) == NULL) { assert(0); } diff --git a/ext/soap/tests/bugs/bug76348.phpt b/ext/soap/tests/bugs/bug76348.phpt new file mode 100644 index 0000000000..6b9e71bc3c --- /dev/null +++ b/ext/soap/tests/bugs/bug76348.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #76348 (WSDL_CACHE_MEMORY causes Segmentation fault) +--SKIPIF-- +<?php +if (!extension_loaded('soap')) die('skip soap extension not available'); +?> +--FILE-- +<?php +$client = new SoapClient(__DIR__ . DIRECTORY_SEPARATOR . 'bug76348.wsdl', [ + 'cache_wsdl' => WSDL_CACHE_MEMORY, +]); +?> +===DONE=== +--EXPECT-- +===DONE=== diff --git a/ext/soap/tests/bugs/bug76348.wsdl b/ext/soap/tests/bugs/bug76348.wsdl new file mode 100644 index 0000000000..ebac20f894 --- /dev/null +++ b/ext/soap/tests/bugs/bug76348.wsdl @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://example.x-road.ee/producer/"
+ xmlns:xrd="http://x-road.eu/xsd/xroad.xsd"
+ targetNamespace="http://example.x-road.ee/producer/">
+ <types>
+ <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://example.x-road.ee/producer/">
+ <import namespace="http://x-road.ee/xsd/x-road.xsd" schemaLocation="http://x-road.ee/xsd/x-road.xsd"/>
+ <import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
+ <element name="exampleOperation">
+ <complexType>
+ <sequence>
+ <element name="request" type="tns:exampleOperationRequest"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="exampleOperationResponse">
+ <complexType>
+ <sequence>
+ <element name="request" type="tns:exampleOperationRequest"/>
+ <element name="response" type="tns:exampleOperationResponse"/>
+ </sequence>
+ </complexType>
+ </element>
+ <complexType name="exampleOperationRequest">
+ <sequence>
+ <element name="name">
+ <complexType>
+ <sequence>
+ <element name="id" type="integer" minOccurs="0" nillable="true" />
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ <complexType name="exampleOperationResponse">
+ <sequence>
+ <element name="ok" type="boolean" />
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+
+
+ <message name="exampleOperationInputMessage">
+ <part name="body" element="tns:exampleOperation"/>
+ </message>
+ <message name="exampleOperationOutputMessage">
+ <part name="body" element="tns:exampleOperationResponse"/>
+ </message>
+
+ <message name="requestheader">
+ <part name="id" element="xrd:id"/>
+ </message>
+
+ <portType name="example_porttype">
+ <operation name="exampleOperation">
+ <input message="tns:exampleOperationInputMessage"/>
+ <output message="tns:exampleOperationOutputMessage"/>
+ </operation>
+ </portType>
+
+ <binding name="example_binding" type="tns:example_porttype">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="exampleOperation">
+ <soap:operation soapAction=""/>
+ <xrd:version>v1</xrd:version>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:header message="tns:requestheader" part="id" use="literal"/>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="example">
+ <port name="example_porttype" binding="tns:example_binding">
+ <soap:address location="http://PROXY/cgi-bin/consumer_proxy"/>
+ </port>
+ </service>
+
+</definitions>
|