rrichards Sat Jul 19 10:59:30 2003 EDT
Modified files:
/php-src/ext/dom php_dom.c document.c
Log:
fix for Bug #24715 segfault in dom_document_create_element
removed xmlmemorydump debug code
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.18 php-src/ext/dom/php_dom.c:1.19
--- php-src/ext/dom/php_dom.c:1.18 Sat Jul 12 13:29:20 2003
+++ php-src/ext/dom/php_dom.c Sat Jul 19 10:59:29 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.18 2003/07/12 17:29:20 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.19 2003/07/19 14:59:29 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -659,7 +659,7 @@
uncomment the following line, this will tell you the amount of not freed memory
and the total used memory into apaches error_log */
/* xmlMemoryDump();*/
-xmlMemoryDump();
+
return SUCCESS;
}
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.14 php-src/ext/dom/document.c:1.15
--- php-src/ext/dom/document.c:1.14 Fri Jul 18 08:41:35 2003
+++ php-src/ext/dom/document.c Sat Jul 19 10:59:29 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.14 2003/07/18 12:41:35 rrichards Exp $ */
+/* $Id: document.c,v 1.15 2003/07/19 14:59:29 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -451,16 +451,16 @@
xmlNode *node;
xmlDocPtr docp;
dom_object *intern;
- int ret, name_len;
- char *name;
+ int ret, name_len, value_len;
+ char *name, *value = NULL;
DOM_GET_THIS_OBJ(docp, id, xmlDocPtr, intern);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name, &name_len)
== FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name, &name_len,
&value, &value_len) == FAILURE) {
return;
}
- node = xmlNewDocNode(docp, NULL, name, NULL);
+ node = xmlNewDocNode(docp, NULL, name, value);
if (!node) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
