rrichards Tue Dec 20 14:13:12 2005 EDT
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
remove leftover code
clear zend_object rather than deal with the guards
issue notice if node is of a type that cannot be expanded
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.22
php-src/ext/xmlreader/php_xmlreader.c:1.23
--- php-src/ext/xmlreader/php_xmlreader.c:1.22 Sun Dec 18 21:17:42 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Tue Dec 20 14:13:11 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.22 2005/12/18 21:17:42 tony2001 Exp $ */
+/* $Id: php_xmlreader.c,v 1.23 2005/12/20 14:13:11 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -352,8 +352,8 @@
zval *tmp;
intern = emalloc(sizeof(xmlreader_object));
+ memset(&intern->std, 0, sizeof(zend_object));
intern->std.ce = class_type;
- intern->std.guards = NULL;
intern->ptr = NULL;
intern->schema = NULL;
intern->prop_handler = &xmlreader_prop_handlers;
@@ -842,7 +842,6 @@
valid_file = _xmlreader_get_valid_file_path(source, resolved_path,
MAXPATHLEN TSRMLS_CC);
if (valid_file) {
- xmlNewTextReaderFilename(valid_file);
reader = xmlReaderForFile(valid_file, encoding, options);
}
@@ -1034,7 +1033,12 @@
RETURN_FALSE;
} else {
nodec = xmlCopyNode(node, 1);
- DOM_RET_OBJ(rv, nodec, &ret, NULL);
+ if (nodec == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Cannot expand this node type");
+ RETURN_FALSE;
+ } else {
+ DOM_RET_OBJ(rv, nodec, &ret, NULL);
+ }
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Load Data before
trying to expand");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
