More fixing for bug #71540

diff --git a/ext/xsl/tests/bug71540.phpt b/ext/xsl/tests/bug71540.phpt
index e93fb0e1252f92a04fac85a3344952696624d6f4..a268021765c5078b2bfef3df486eb0516ab466e6 100644 (file)
--- 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 ec3042311dfb3b8e136f61de1a82a3fb5a01b28a..600c7cddb06aa20d71e65df7d5c72b2ce39836df 100644 (file)
--- 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 *) ""));