From fc4ef8692e82b3e480b76daf088f099897a790e8 Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Thu, 30 May 2019 22:58:09 +0900 Subject: [PATCH] quartz: Ensure error text is terminated with NUL character. Signed-off-by: Akihiro Sagawa Signed-off-by: Alexandre Julliard --- dlls/quartz/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 08287a75ebc..282104e19c5 100644 --- 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; } /***********************************************************************