cvs: php4 /ext/domxml php_domxml.c

chregu Mon Jul 29 10:04:45 2002 EDT Modified files: /php4/ext/domxml php_domxml.c Log: - nodename is not always set, check if it really is. - make force_ref for aliases as well Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.181 php4/ext/domxml/php_domxml.c:1.182 --- php4/ext/domxml/php_domxml.c:1.181 Wed Jul 17 04:57:29 2002 +++ php4/ext/domxml/php_domxml.c Mon Jul 29 10:04:44 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.181 2002/07/17 08:57:29 chregu Exp $ */ +/* $Id: php_domxml.c,v 1.182 2002/07/29 14:04:44 chregu Exp $ */ /* TODO * - Support Notation Nodes @@ -203,9 +203,9 @@ static zend_function_entry domxml_functions[] = { PHP_FE(domxml_version, NULL) PHP_FE(xmldoc, third_args_force_ref) - PHP_FALIAS(domxml_open_mem, xmldoc, NULL) + PHP_FALIAS(domxml_open_mem, xmldoc, third_args_force_ref) PHP_FE(xmldocfile, third_args_force_ref) - PHP_FALIAS(domxml_open_file, xmldocfile, NULL) + PHP_FALIAS(domxml_open_file, xmldocfile, third_args_force_ref) #if defined(LIBXML_HTML_ENABLED) PHP_FE(html_doc, NULL) PHP_FE(html_doc_file, NULL) @@ -1418,7 +1418,9 @@ // do error handling here } if (ctxt->parser != NULL) { - add_assoc_string(errormessages,"nodename",ctxt->parser->name,1); + if (ctxt->parser->name) { + add_assoc_string(errormessages,"nodename",ctxt->parser->name,1); + } if (ctxt->parser->input != NULL) { add_assoc_long(errormessages,"line",ctxt->parser->input->line);