com php-src: More fixing for bug #71540: ext/xsl/tests/bug71540.phpt ext/xsl/xsltprocessor.c

Commit: c1355152dbdf131ebda1a21e7c66913b4ed9037c Author: Stanislav Malyshev <stas@php.net> Mon, 15 Feb 2016 01:53:02 -0800 Parents: e34a7a1b08342489e5ee1a83b00d98c4d9084c83 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1355152dbdf131ebda1a21e7c66913b4ed9037c Log: More fixing for bug #71540 Bugs: https://bugs.php.net/71540 Changed paths: M ext/xsl/tests/bug71540.phpt M ext/xsl/xsltprocessor.c Diff: diff --git a/ext/xsl/tests/bug71540.phpt b/ext/xsl/tests/bug71540.phpt index e93fb0e..a268021 100644 --- a/ext/xsl/tests/bug71540.phpt +++ b/ext/xsl/tests/bug71540.phpt @@ -55,6 +55,8 @@ Warning: XSLTProcessor::transformToXml(): Stack usage errror in %sbug71540.php o Warning: XSLTProcessor::transformToXml(): Stack usage errror in %sbug71540.php on line %d +Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %sbug71540.php on line %d + Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: 2 objects left on the stack. in %sbug71540.php on line %d Warning: XSLTProcessor::transformToXml(): runtime error: file %s line 13 element value-of in %sbug71540.php on line %d diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index ec30423..600c7cd 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -304,7 +304,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t obj = valuePop(ctxt); - if (obj->stringval == NULL) { + if (obj == NULL || obj->stringval == NULL) { php_error_docref(NULL, E_WARNING, "Handler name must be a string"); xmlXPathFreeObject(obj); valuePush(ctxt, xmlXPathNewString((const xmlChar *) ""));