Handle errors and encoding

Author: nielsdos

ext/dom/document.c

@@ -1572,7 +1572,7 @@ PHP_METHOD(DOMDocument, saveXML)
 	libxml_doc_props const* doc_props = dom_get_doc_props_read_only(intern->document);
 	format = doc_props->formatoutput;
 
-	int status;
+	int status = -1;
 	if (nodep != NULL) {
 		/* Dump contents of Node */
 		DOM_GET_OBJ(node, nodep, xmlNodePtr, nodeobj);
@@ -1590,13 +1590,18 @@ PHP_METHOD(DOMDocument, saveXML)
 		old_xml_save_no_empty_tags = xmlSaveNoEmptyTags;
 		xmlSaveNoEmptyTags = (options & LIBXML_SAVE_NOEMPTYTAG) ? 1 : 0;
 		if (php_dom_follow_spec_intern(intern)) {
-			// TODO: dedup
 			xmlSaveCtxtPtr ctxt = xmlSaveToBuffer(buf, (const char *) docp->encoding, XML_SAVE_AS_XML);
-			xmlOutputBufferPtr out = xmlOutputBufferCreateBuffer(buf, NULL); // TODO: set handler instead of NULL, & check return value
-			status = dom_xml_serialize(ctxt, out, node, format);
-			status |= xmlOutputBufferFlush(out);
-			status |= xmlOutputBufferClose(out);
-			(void) xmlSaveClose(ctxt);
+			if (EXPECTED(ctxt != NULL)) {
+				xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler((const char *) docp->encoding);
+				xmlOutputBufferPtr out = xmlOutputBufferCreateBuffer(buf, handler);
+				if (EXPECTED(out != NULL)) {
+					status = dom_xml_serialize(ctxt, out, node, format);
+					status |= xmlOutputBufferFlush(out);
+					status |= xmlOutputBufferClose(out);
+				}
+				(void) xmlSaveClose(ctxt);
+				xmlCharEncCloseFunc(handler);
+			}
 		} else {
 			status = xmlNodeDump(buf, docp, node, 0, format);
 		}
@@ -1627,10 +1632,14 @@ PHP_METHOD(DOMDocument, saveXML)
 			RETURN_FALSE;
 		}
 		if (php_dom_follow_spec_intern(intern)) {
-			xmlOutputBufferPtr out = xmlOutputBufferCreateBuffer(buf, NULL); // TODO: set handler instead of NULL, & check return value
-			status = dom_xml_serialize(ctxt, out, (xmlNodePtr) docp, format);
-			status |= xmlOutputBufferFlush(out);
-			status |= xmlOutputBufferClose(out);
+			xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler((const char *) docp->encoding);
+			xmlOutputBufferPtr out = xmlOutputBufferCreateBuffer(buf, handler);
+			if (EXPECTED(out != NULL)) {
+				status = dom_xml_serialize(ctxt, out, (xmlNodePtr) docp, format);
+				status |= xmlOutputBufferFlush(out);
+				status |= xmlOutputBufferClose(out);
+			}
+			xmlCharEncCloseFunc(handler);
 		} else {
 			status = xmlSaveDoc(ctxt, docp);
 		}