cvs: php-src(PHP_5_0) /ext/xsl xsltprocessor.c
| From: | Rob Richards | Date: | Tue, 14 Jun 2005 19:40:34 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/xsl xsltprocessor.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32268@lists.php.net to get a copy of this message | ||
rrichards Tue Jun 14 15:40:34 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xsl xsltprocessor.c
Log:
MFH: Fixed bug #33340 (CLI Crash when calling php:function from XSLT)
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.29.2.5&r2=1.29.2.6&ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.29.2.5 php-src/ext/xsl/xsltprocessor.c:1.29.2.6
--- php-src/ext/xsl/xsltprocessor.c:1.29.2.5 Mon Jan 17 11:01:35 2005
+++ php-src/ext/xsl/xsltprocessor.c Tue Jun 14 15:40:33 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xsltprocessor.c,v 1.29.2.5 2005/01/17 16:01:35 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.29.2.6 2005/06/14 19:40:33 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -200,7 +200,7 @@
int j;
dom_object *domintern;
array_init(args[i]);
- if (obj->nodesetval->nodeNr > 0) {
+ if (obj->nodesetval && obj->nodesetval->nodeNr > 0) {
domintern = (dom_object *) php_dom_object_get_data((void *)
obj->nodesetval->nodeTab[0]->doc);
for (j = 0; j < obj->nodesetval->nodeNr; j++) {
xmlNodePtr node = obj->nodesetval->nodeTab[j];