[PATCH v3 3/6] xmllite/writer: Improve error handling in WriteNmToken().

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/xmllite/writer.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c
index 7417a44caff..83fc98d48c9 100644
--- a/dlls/xmllite/writer.c
+++ b/dlls/xmllite/writer.c
@@ -1594,7 +1594,8 @@ static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName)
 static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, const WCHAR *nmtoken)
 {
     xmlwriter *writer = impl_from_IXmlWriter(iface);
-    unsigned int len;
+    unsigned int len = 0;
+    HRESULT hr = S_OK;

TRACE("%p, %s\n", iface, wine_dbgstr_w(nmtoken));

@@ -1612,16 +1613,16 @@ static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, const WCHAR *nmt
     case XmlWriterState_InvalidEncoding:
         return MX_E_ENCODING;
     case XmlWriterState_ElemStarted:
-        writer_close_starttag(writer);
+        hr = writer_close_starttag(writer);
         break;
     default:
         ;
     }

-    if (!is_valid_nmtoken(nmtoken, &len))
-        return WC_E_NAMECHARACTER;
+    if (SUCCEEDED(hr) && !is_valid_nmtoken(nmtoken, &len))
+        hr = WC_E_NAMECHARACTER;

-    return write_output_buffer(writer->output, nmtoken, len);
+    return write_output(writer, nmtoken, len, &hr);
 }

static HRESULT writer_write_node(IXmlWriter *writer, IXmlReader *reader, BOOL shallow, BOOL write_default_attributes)