chregu Wed Jun 14 09:42:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xsl xsltprocessor.c
Log:
MFH
Fix a segfault, when an unknown type was given and support all known xpath
object types
http://cvs.php.net/viewcvs.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.1&r2=1.39.2.2.2.2&diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.1
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.2
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.1 Fri May 12 18:53:40 2006
+++ php-src/ext/xsl/xsltprocessor.c Wed Jun 14 09:42:35 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.1 2006/05/12 18:53:40 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.2 2006/06/14 09:42:35 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -231,8 +231,7 @@
}
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"php:function object type %d is not supported yet", obj->type);
- ZVAL_STRING(args[i], "", 0);
+ ZVAL_STRING(args[i], xmlXPathCastToString(obj), 1);
}
xmlXPathFreeObject(obj);
fci.params[i] = &args[i];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
