diff options
| author | Rob Richards <rrichards@php.net> | 2005-12-20 14:13:11 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2005-12-20 14:13:11 +0000 |
| commit | ad97cf20be082884ef41e43a4c147cd8a4295df5 (patch) | |
| tree | 171e24caaced4490e992ca0d5ebadc0fe549bf62 | |
| parent | 320b5ce4614b6a8feaba646b0c08af2c393cdd49 (diff) | |
| download | php-git-ad97cf20be082884ef41e43a4c147cd8a4295df5.tar.gz | |
remove leftover code
clear zend_object rather than deal with the guards
issue notice if node is of a type that cannot be expanded
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index ccf3db2690..8330a9bed5 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -352,8 +352,8 @@ zend_object_value xmlreader_objects_new(zend_class_entry *class_type TSRMLS_DC) 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 @@ PHP_METHOD(xmlreader, open) 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 @@ PHP_METHOD(xmlreader, expand) 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"); |