webservices: Avoid decoding a nul character reference.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

webservices: Avoid decoding a nul character reference.
064edd2d · Akihiro Sagawa · Alexandre Julliard · c11d931e · 064edd2d · 064edd2d
Commit 064edd2d authored Oct 10, 2016 by Akihiro Sagawa Committed by Alexandre Julliard Oct 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

reader.c dlls/webservices/reader.c +2 -0

reader.c dlls/webservices/tests/reader.c +2 -0

No files found.
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -1166,6 +1166,8 @@ static HRESULT parse_name( const unsigned char *str, unsigned int len,

 static int codepoint_to_utf8( int cp, unsigned char *dst )
 {
+    if (!cp)
+        return -1;
    if (cp < 0x80)
    {
        *dst = cp;

--- a/dlls/webservices/tests/reader.c
+++ b/dlls/webservices/tests/reader.c
@@ -3610,6 +3610,7 @@ static void test_entities(void)
    static const char str25[] = "<t>&#xfffe;</t>";
    static const char str26[] = "<t>&#xffff;</t>";
    static const char str27[] = "<t>&LT;</t>";
+    static const char str28[] = "<t>&#x0;</t>";
    static const char res4[] = {0xea, 0xaa, 0xaa, 0x00};
    static const char res5[] = {0xf2, 0xaa, 0xaa, 0xaa, 0x00};
    static const char res21[] = {0xed, 0x9f, 0xbf, 0x00};
@@ -3649,6 +3650,7 @@ static void test_entities(void)
        { str25, WS_E_INVALID_FORMAT },
        { str26, WS_E_INVALID_FORMAT },
        { str27, WS_E_INVALID_FORMAT },
+        { str28, WS_E_INVALID_FORMAT },
    };
    HRESULT hr;
    WS_XML_READER *reader;