@@ -975,9 +975,7 @@ PHP_METHOD(DOMDocument, createElementNS)
975
975
PHP_METHOD (DOM_Document , createElementNS )
976
976
{
977
977
xmlDocPtr docp ;
978
- xmlNodePtr nodep = NULL ;
979
978
int ret ;
980
- int errorcode ;
981
979
dom_object * intern ;
982
980
zend_string * name = NULL , * uri ;
983
981
@@ -988,17 +986,17 @@ PHP_METHOD(DOM_Document, createElementNS)
988
986
DOM_GET_OBJ (docp , ZEND_THIS , xmlDocPtr , intern );
989
987
990
988
xmlChar * localname = NULL , * prefix = NULL ;
991
- errorcode = dom_validate_and_extract (uri , name , & localname , & prefix );
989
+ int errorcode = dom_validate_and_extract (uri , name , & localname , & prefix );
992
990
993
991
if (errorcode == 0 ) {
994
992
php_dom_libxml_ns_mapper * ns_mapper = php_dom_get_ns_mapper (intern );
995
993
xmlNsPtr ns = php_dom_libxml_ns_mapper_get_ns_raw_prefix_string (ns_mapper , prefix , xmlStrlen (prefix ), uri );
996
- nodep = xmlNewDocNode (docp , ns , localname , NULL );
994
+ xmlNodePtr nodep = xmlNewDocNode (docp , ns , localname , NULL );
997
995
if (UNEXPECTED (nodep == NULL )) {
998
996
php_dom_throw_error (INVALID_STATE_ERR , /* strict */ true);
999
- RETURN_THROWS ();
997
+ } else {
998
+ DOM_RET_OBJ (nodep , & ret , intern );
1000
999
}
1001
- DOM_RET_OBJ (nodep , & ret , intern );
1002
1000
} else {
1003
1001
php_dom_throw_error (errorcode , dom_get_strict_error (intern -> document ));
1004
1002
}
0 commit comments