[PATCH 0/1] MR10379: dwrite: Handle zero-length name strings.

[Nikolay Sivov (＠nsivov)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59542
Signed-off-by: Nikolay Sivov <[e-mail]>

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

[PATCH 1/1] dwrite: Handle zero-length name strings.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59542
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/dwrite/opentype.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 380732a8c85..7b95ead9f55 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -2391,19 +2391,26 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns
         codepage = get_name_record_codepage(platform, encoding);
         get_name_record_locale(platform, lang_id, locale, ARRAY_SIZE(locale));
 
-        if (codepage)
+        if (length)
         {
-            DWORD len = MultiByteToWideChar(codepage, 0, name, length, NULL, 0);
-            name_string = malloc(sizeof(WCHAR) * (len+1));
-            MultiByteToWideChar(codepage, 0, name, length, name_string, len);
-            name_string[len] = 0;
+            if (codepage)
+            {
+                DWORD len = MultiByteToWideChar(codepage, 0, name, length, NULL, 0);
+                name_string = malloc(sizeof(WCHAR) * (len+1));
+                MultiByteToWideChar(codepage, 0, name, length, name_string, len);
+                name_string[len] = 0;
+            }
+            else
+            {
+                length /= sizeof(WCHAR);
+                name_string = heap_strdupnW(name, length);
+                for (i = 0; i < length; i++)
+                    name_string[i] = GET_BE_WORD(name_string[i]);
+            }
         }
         else
         {
-            length /= sizeof(WCHAR);
-            name_string = heap_strdupnW(name, length);
-            for (i = 0; i < length; i++)
-                name_string[i] = GET_BE_WORD(name_string[i]);
+            name_string = calloc(1, sizeof(*name_string));
         }
 
         TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale));
-- 
GitLab

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