Skip to content

Commit d30dd1b

Browse files
committed
Fix GH-19784: SoapServer memory leak
Closes GH-19818.
1 parent b8a9d79 commit d30dd1b

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ PHP NEWS
1313
. Fix cloning of CURLOPT_POSTFIELDS when using the clone operator instead
1414
of the curl_copy_handle() function to clone a CurlHandle. (timwolla)
1515

16+
- Soap:
17+
. Fixed bug GH-19784 (SoapServer memory leak). (nielsdos)
18+
1619
- Standard:
1720
. Fixed bug GH-12265 (Cloning an object breaks serialization recursion).
1821
(nielsdos)

ext/soap/soap.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,13 @@ PHP_METHOD(SoapServer, __construct)
880880
service->soap_functions.ft = zend_new_array(0);
881881

882882
if (wsdl) {
883-
service->sdl = get_sdl(ZEND_THIS, ZSTR_VAL(wsdl), cache_wsdl);
883+
zend_try {
884+
service->sdl = get_sdl(ZEND_THIS, ZSTR_VAL(wsdl), cache_wsdl);
885+
} zend_catch {
886+
xmlCharEncCloseFunc(service->encoding);
887+
service->encoding = NULL;
888+
zend_bailout();
889+
} zend_end_try();
884890
if (service->uri == NULL) {
885891
if (service->sdl->target_ns) {
886892
service->uri = estrdup(service->sdl->target_ns);

ext/soap/tests/bugs/gh19784.phpt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--TEST--
2+
GH-19784 (SoapServer memory leak)
3+
--EXTENSIONS--
4+
soap
5+
--FILE--
6+
<?php
7+
$v_5256 = 'zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p';
8+
$v_5257 = base64_decode($v_5256,);
9+
$v_5238 = array('encoding' => $v_5257);
10+
new SoapServer('foobarbaz',$v_5238,);
11+
?>
12+
--EXPECTF--
13+
<?xml version="1.0" encoding="UTF-8"?>
14+
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>%s</faultcode><faultstring>%a

0 commit comments

Comments
 (0)