[PATCH v6 0/1] MR1024: xmllite/writer: Null terminate duplicated strings.

[David Kahurani (＠kahurani)]

Currently, the code copies one extra character than requested and does not terminate the string.

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com>

--
  v6: xmllite/writer: Null terminate duplicated strings.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1024

[PATCH v6 1/1] xmllite/writer: Null terminate duplicated strings.

[David Kahurani]

From: David Kahurani <k.kahurani(a)gmail.com>

Strings are not being "partially duplicated", but duplicated
with explicit length.

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com>
---
 dlls/xmllite/writer.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c
index c4f9ed2f440..065716f7e8c 100644
--- a/dlls/xmllite/writer.c
+++ b/dlls/xmllite/writer.c
@@ -250,7 +250,6 @@ static struct element *pop_element(xmlwriter *writer)
 
 static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len)
 {
-    size_t size;
     WCHAR *ret;
 
     if (!str)
@@ -259,9 +258,12 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len
     if (len == -1)
         len = lstrlenW(str);
 
-    size = (len + 1) * sizeof(WCHAR);
-    ret = writer_alloc(writer, size);
-    if (ret) memcpy(ret, str, size);
+    ret = writer_alloc(writer, (len + 1) * sizeof(WCHAR));
+    if (ret)
+    {
+        memcpy(ret, str, len * sizeof(WCHAR));
+        ret[len] = 0;
+    }
 
     return ret;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1024

[PATCH v6 1/1] xmllite/writer: Null terminate duplicated strings.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125028

Your paranoid android.


=== debian11 (build log) ===

068c:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
068c:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.
068c:err:winediag:d3d_device_create The application wants to create a Direct3D device, but the current DirectDrawRenderer does not support this.

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24737.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24737.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24737.

[David Kahurani (＠kahurani)]

It should be good now(?)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1024#note_10840

[PATCH v6 0/1] MR1024: xmllite/writer: Null terminate duplicated strings. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1024