quartz: Ensure error text is terminated with NUL character.

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

quartz: Ensure error text is terminated with NUL character.
fc4ef869 · Akihiro Sagawa · Alexandre Julliard · 7b8554b3 · fc4ef869
Commit fc4ef869 authored May 30, 2019 by Akihiro Sagawa Committed by Alexandre Julliard May 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

main.c dlls/quartz/main.c +7 -1

No files found.
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -313,7 +313,13 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen)
        return 0;

    res = AMGetErrorTextW(hr, errorW, ARRAY_SIZE(errorW));
-    return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0);
+    if (!res)
+        return 0;
+
+    res = WideCharToMultiByte(CP_ACP, 0, errorW, -1, NULL, 0, 0, 0);
+    if (res > maxlen || !res)
+        return 0;
+    return WideCharToMultiByte(CP_ACP, 0, errorW, -1, buffer, maxlen, 0, 0) - 1;
 }

 /***********************************************************************