[PATCH] xmllite: Don't lose terminating character when shrinking buffer

Eduard Permyakov epermyakov at codeweavers.com
Fri Aug 6 07:01:16 CDT 2021


The utf16 buffer is expected to be terminated by a '0' character.
Flawed buffer shrinking logic would move the buffer contents but
forget about the terminating character, which could cause reading
junk past the end of the buffer contents.

Signed-off-by: Eduard Permyakov <epermyakov at codeweavers.com>
---
 dlls/xmllite/reader.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index a5a75c29887..834c36ae18c 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -2128,6 +2128,7 @@ static HRESULT reader_parse_reference(xmlreader *reader)
         memmove(start + 1, ptr + 1, len);
 
         buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR);
+        *(WCHAR*)(buffer->data + buffer->written) = 0;
         buffer->cur = cur + 1;
 
         *start = ch;
@@ -2151,6 +2152,7 @@ static HRESULT reader_parse_reference(xmlreader *reader)
             memmove(start+1, ptr+1, len);
             buffer->cur = cur + 1;
             buffer->written -= (ptr - start) * sizeof(WCHAR);
+            *(WCHAR*)(buffer->data + buffer->written) = 0;
 
             *start = ch;
         }
-- 
2.17.1




More information about the wine-devel mailing list