cvs: php4(PHP_4_3) /ext/domxml php_domxml.c
| From: | Christian Stocker | Date: | Tue, 13 May 2003 14:42:23 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20858@lists.php.net to get a copy of this message | ||
chregu Tue May 13 10:42:23 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/domxml php_domxml.c
Log:
fix possible segfault
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.218.2.22 php4/ext/domxml/php_domxml.c:1.218.2.23
--- php4/ext/domxml/php_domxml.c:1.218.2.22 Mon May 5 10:46:49 2003
+++ php4/ext/domxml/php_domxml.c Tue May 13 10:42:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.22 2003/05/05 14:46:49 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.23 2003/05/13 14:42:23 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -5406,13 +5406,16 @@
DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp);
ret = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, xmldocp, xsltstp);
-
if (ret < 0) {
RETURN_FALSE;
}
-
- RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
- xmlFree(doc_txt_ptr);
+
+ if (doc_txt_ptr) {
+ RETVAL_STRINGL(doc_txt_ptr, doc_txt_len, 1);
+ xmlFree(doc_txt_ptr);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
/* }}} */