kernelbase: Put 0 to output string even for 1 char buffer in LoadStringW().

ed7aca01 · Paul Gofman · Alexandre Julliard · d93e2899 · ed7aca01
Commit ed7aca01 authored Nov 08, 2023 by Paul Gofman Committed by Alexandre Julliard Nov 09, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 13 deletions

string.c dlls/kernelbase/string.c +2 -13

No files found.
--- a/dlls/kernelbase/string.c
+++ b/dlls/kernelbase/string.c
@@ -1253,19 +1253,8 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L
    }

    i = min(buflen - 1, *p);
-    if (i > 0)
-    {
-        memcpy(buffer, p + 1, i * sizeof (WCHAR));
-        buffer[i] = 0;
-    }
-    else
-    {
-        if (buflen > 1)
-        {
-            buffer[0] = 0;
-            return 0;
-        }
-    }
+    memcpy(buffer, p + 1, i * sizeof(WCHAR));
+    buffer[i] = 0;

    TRACE("returning %s\n", debugstr_w(buffer));
    return i;