xmllite/writer: Properly validate DocType name.

Current code skips a character and goes on to run is_namechar the next instead of the current character ultimately always running a null string on is_namechar and therefore always returning error on multi-character strings Signed-off-by: David Kahurani <k.kahurani@gmail.com>

xmllite/writer: Properly validate DocType name.
fa591d3c · David Kahurani · Alexandre Julliard · b402ce89 · fa591d3c · fa591d3c
Commit fa591d3c authored Oct 07, 2022 by David Kahurani Committed by Alexandre Julliard Oct 10, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

writer.c dlls/xmllite/tests/writer.c +8 -0

writer.c dlls/xmllite/writer.c +2 -1

No files found.
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -2145,6 +2145,14 @@ static void test_WriteDocType(void)
    hr = IXmlWriter_WriteDocType(writer, L"a", pubidW, NULL, NULL);
    ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr);

+    /* Invalid multi-character string */
+    hr = IXmlWriter_WriteDocType(writer, L":ax>m", NULL, NULL, NULL);
+    ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr);
+
+    /* Valid multi-character string */
+    hr = IXmlWriter_WriteDocType(writer, L"root", NULL, NULL, NULL);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
    IStream_Release(stream);

    for (i = 0; i < ARRAY_SIZE(doctype_tests); i++)

--- a/dlls/xmllite/writer.c
+++ b/dlls/xmllite/writer.c
@@ -376,11 +376,12 @@ static HRESULT is_valid_name(const WCHAR *str, unsigned int *out)
    if (!is_namestartchar(*str++))
        return WC_E_NAMECHARACTER;

-    while (*str++)
+    while (*str)
    {
        if (!is_namechar(*str))
            return WC_E_NAMECHARACTER;
        len++;
+        str++;
    }

    *out = len;