[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6

Author: Daniel Scherzer (DanielEScherzer) Date: 2026-10-02T18:30:35-07:00 Commit: https://github.com/php/php-src/commit/bd334e6bd7c241da895c38bf66a5d8a5ce3c5349 Raw diff: https://github.com/php/php-src/commit/bd334e6bd7c241da895c38bf66a5d8a5ce3c5349.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: ext/soap: fix leak when load_wsdl_ex() fails to load (#24066) Changed paths: A ext/soap/tests/load_wsdl_ex-failure-leak.phpt A ext/soap/tests/load_wsdl_ex-failure-leak.wsdl M NEWS M ext/soap/php_sdl.c Diff: diff --git a/NEWS b/NEWS index ee72be3bfaaf..992c885fc427 100644 --- a/NEWS +++ b/NEWS @@ -121,6 +121,7 @@ PHP NEWS - SOAP: . Fixed bug GH-22895 (Heap use-after-free while encoding a Traversable with an illegal key). (David Carlier) + . Fixed memory leak when load_wsdl_ex() failed to load. (DanielEScherzer) - Tidy: . Fixed a use-after-free when a tidyNode is used after its document is diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 3062a2d4dbf6..3ffa67cfb910 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -361,7 +361,12 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, bool include xmlAttrPtr tmp = get_attribute(trav->properties, "location"); if (tmp) { xmlChar *uri = schema_location_construct_uri(tmp); - load_wsdl_ex(this_ptr, (char*)uri, ctx, true); + zend_try { + load_wsdl_ex(this_ptr, (char*)uri, ctx, true); + } zend_catch { + xmlFree(uri); + zend_bailout(); + } zend_end_try(); xmlFree(uri); } diff --git a/ext/soap/tests/load_wsdl_ex-failure-leak.phpt b/ext/soap/tests/load_wsdl_ex-failure-leak.phpt new file mode 100644 index 000000000000..b71c6183a513 --- /dev/null +++ b/ext/soap/tests/load_wsdl_ex-failure-leak.phpt @@ -0,0 +1,18 @@ +--TEST-- +load_wsdl_ex() leaks the import location if imported WSDL fails to load +--EXTENSIONS-- +soap +--INI-- +soap.wsdl_cache_enabled=0 +--FILE-- +<?php + +try { + $client = new SoapClient(__DIR__ . '/load_wsdl_ex-failure-leak.wsdl'); +} catch (SoapFault $e) { + echo get_class($e) . ': ' . $e->getMessage() . "\n"; +} + +?> +--EXPECTF-- +SoapFault: SOAP-ERROR: Parsing WSDL: Couldn't load from '%sload_wsdl_ex-failure-leak-missing.wsdl' : %s diff --git a/ext/soap/tests/load_wsdl_ex-failure-leak.wsdl b/ext/soap/tests/load_wsdl_ex-failure-leak.wsdl new file mode 100644 index 000000000000..b9065bbeb1d6 --- /dev/null +++ b/ext/soap/tests/load_wsdl_ex-failure-leak.wsdl @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<definitions + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" +> + <import location="load_wsdl_ex-failure-leak-missing.wsdl"/> +</definitions>