Throw DomException instead

Author: nikic

ext/dom/document.c

@@ -506,10 +506,6 @@ int dom_document_config_read(dom_object *obj, zval *retval)
 
 /* }}} */
 
-ZEND_NORETURN static void php_dom_fatal_libxml_error(void) {
-	zend_error_noreturn(E_ERROR, "Libxml error: Likely out of memory");
-}
-
 /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
 Since:
 */
@@ -537,7 +533,8 @@ PHP_METHOD(DOMDocument, createElement)
 
 	node = xmlNewDocNode(docp, NULL, (xmlChar *) name, (xmlChar *) value);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ(node, &ret, intern);
@@ -564,7 +561,8 @@ PHP_METHOD(DOMDocument, createDocumentFragment)
 
 	node = xmlNewDocFragment(docp);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ(node, &ret, intern);
@@ -593,7 +591,8 @@ PHP_METHOD(DOMDocument, createTextNode)
 
 	node = xmlNewDocText(docp, (xmlChar *) value);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ(node, &ret, intern);
@@ -622,7 +621,8 @@ PHP_METHOD(DOMDocument, createComment)
 
 	node = xmlNewDocComment(docp, (xmlChar *) value);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ(node, &ret, intern);
@@ -651,7 +651,8 @@ PHP_METHOD(DOMDocument, createCDATASection)
 
 	node = xmlNewCDataBlock(docp, (xmlChar *) value, value_len);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ(node, &ret, intern);
@@ -685,7 +686,8 @@ PHP_METHOD(DOMDocument, createProcessingInstruction)
 
 	node = xmlNewPI((xmlChar *) name, (xmlChar *) value);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	node->doc = docp;
@@ -721,7 +723,8 @@ PHP_METHOD(DOMDocument, createAttribute)
 
 	node = xmlNewDocProp(docp, (xmlChar *) name, NULL);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ((xmlNodePtr) node, &ret, intern);
@@ -756,7 +759,8 @@ PHP_METHOD(DOMDocument, createEntityReference)
 
 	node = xmlNewReference(docp, (xmlChar *) name);
 	if (!node) {
-		php_dom_fatal_libxml_error();
+		php_dom_throw_error(LIBXML_ERR, /* strict */ true);
+		RETURN_THROWS();
 	}
 
 	DOM_RET_OBJ((xmlNodePtr) node, &ret, intern);

ext/dom/domexception.c

@@ -97,6 +97,9 @@ void php_dom_throw_error(int error_code, int strict_error)
 		case VALIDATION_ERR:
 			error_message = "Validation Error";
 			break;
+		case LIBXML_ERR:
+			error_message = "Unknown LibXML error, likely out of memory";
+			break;
 		default:
 			error_message = "Unhandled Error";
 	}

ext/dom/domexception.h

@@ -43,7 +43,9 @@ typedef enum {
 /* Introduced in DOM Level 2: */
 	INVALID_ACCESS_ERR             = 15,
 /* Introduced in DOM Level 3: */
-	VALIDATION_ERR                 = 16
+	VALIDATION_ERR                 = 16,
+	/* Unknown libxml error, likely out of memory. */
+	LIBXML_ERR                     = 128,
 } dom_exception_code;
 
 #endif /* DOM_EXCEPTION_H */

ext/dom/php_dom.c

@@ -839,6 +839,7 @@ PHP_MINIT_FUNCTION(dom)
 	REGISTER_LONG_CONSTANT("DOM_NAMESPACE_ERR",			NAMESPACE_ERR,			CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("DOM_INVALID_ACCESS_ERR",	INVALID_ACCESS_ERR,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("DOM_VALIDATION_ERR",		VALIDATION_ERR,			CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("DOM_LIBXML_ERR",			LIBXML_ERR,			CONST_CS | CONST_PERSISTENT);
 
 	php_libxml_register_export(dom_node_class_entry, php_dom_export_node);