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

From: Date: Fri, 20 Nov 2026 00:17:44 +0000
Subject: [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-143953@lists.php.net to get a copy of this message
Author: Ilia Alshanetsky (iliaal) Date: 2026-11-19T19:13:48-05:00 Commit: https://github.com/php/php-src/commit/c96217ac00bf23a244b2adf81c7cbe74a26a924d Raw diff: https://github.com/php/php-src/commit/c96217ac00bf23a244b2adf81c7cbe74a26a924d.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: ext/xsl: Fix crash in transformToDoc() with an uninstantiable class Changed paths: A ext/xsl/tests/transformToDoc_uninstantiable_class.phpt M NEWS M ext/xsl/xsltprocessor.c Diff: diff --git a/NEWS b/NEWS index 3ccb8c0c0d2c..d9d78c77a230 100644 --- a/NEWS +++ b/NEWS @@ -215,6 +215,10 @@ PHP NEWS . Fixed bug GH-15701 (Build failure: incompatible funopen() seeker pointer type on 32-bit platforms). (Kamil Tekiela) +- XSL: + . Fixed a crash in XSLTProcessor::transformToDoc() when the return class + cannot be instantiated. (Ilia Alshanetsky) + 19 Nov 2026, PHP 8.6.0 - Core: diff --git a/ext/xsl/tests/transformToDoc_uninstantiable_class.phpt b/ext/xsl/tests/transformToDoc_uninstantiable_class.phpt new file mode 100644 index 000000000000..328e6888a444 --- /dev/null +++ b/ext/xsl/tests/transformToDoc_uninstantiable_class.phpt @@ -0,0 +1,47 @@ +--TEST-- +XSLTProcessor::transformToDoc() with a return class that cannot be instantiated +--EXTENSIONS-- +xsl +dom +simplexml +--FILE-- +<?php + +abstract class AbstractDocument extends DOMDocument {} +abstract class AbstractElement extends SimpleXMLElement {} +class UndefinedConstantDocument extends DOMDocument { + public $value = UNDEFINED_CONSTANT; +} + +$stylesheet = new DOMDocument; +$stylesheet->loadXML('<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:template match="/"><out/></xsl:template></xsl:stylesheet>'); +$processor = new XSLTProcessor; +$processor->importStylesheet($stylesheet); + +$dom = new DOMDocument; +$dom->loadXML('<root/>'); +$sxe = simplexml_load_string('<root/>'); +$modern = Dom\XMLDocument::createFromString('<root/>'); + +foreach ([[$dom, AbstractDocument::class], [$sxe, AbstractElement::class], [$dom, UndefinedConstantDocument::class], [$modern, Dom\Document::class]] as [$input, $class]) { + try { + $processor->transformToDoc($input, $class); + } catch (Error $e) { + echo $e::class, ": ", $e->getMessage(), PHP_EOL; + } +} + +define('UNDEFINED_CONSTANT', 'defined'); +$result = $processor->transformToDoc($dom, UndefinedConstantDocument::class); +echo $result::class, ": ", $result->value, PHP_EOL; +echo $result->saveXML(); + +?> +--EXPECT-- +Error: Cannot instantiate abstract class AbstractDocument +Error: Cannot instantiate abstract class AbstractElement +Error: Undefined constant "UNDEFINED_CONSTANT" +Error: Cannot instantiate abstract class Dom\Document +UndefinedConstantDocument: defined +<?xml version="1.0"?> +<out/> diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index 3f6a7b6aa923..701b962d6b98 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -474,7 +474,10 @@ PHP_METHOD(XSLTProcessor, transformToDoc) RETURN_THROWS(); } - object_init_ex(return_value, ret_class); + if (UNEXPECTED(object_init_ex(return_value, ret_class) != SUCCESS)) { + xmlFreeDoc(newdocp); + RETURN_THROWS(); + } interndoc = Z_LIBXML_NODE_P(return_value); php_libxml_increment_doc_ref(interndoc, newdocp);

« previous php.cvs (#143953) next »