Skip to content

Commit 469aa25

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-19784: SoapServer memory leak
2 parents edc2671 + 61265c2 commit 469aa25

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

ext/soap/soap.c

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

10151015
if (wsdl) {
1016-
service->sdl = get_sdl(ZEND_THIS, ZSTR_VAL(wsdl), cache_wsdl);
1016+
zend_try {
1017+
service->sdl = get_sdl(ZEND_THIS, ZSTR_VAL(wsdl), cache_wsdl);
1018+
} zend_catch {
1019+
xmlCharEncCloseFunc(service->encoding);
1020+
service->encoding = NULL;
1021+
zend_bailout();
1022+
} zend_end_try();
10171023
if (service->uri == NULL) {
10181024
if (service->sdl->target_ns) {
10191025
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)