Module: wine Branch: stable Commit: faa13dd161fd3d0aaf14c34c86d1eda2c23a85cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa13dd161fd3d0aaf14c34c86...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Thu Jun 22 15:56:24 2017 +0800
user.exe16: Fix memory leak in case when HeapReAlloc fails.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 8c3ed829279cb7951688392801e3210abd19d27f) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/user.exe16/user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index aba797d..4a00d58 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3245,8 +3245,11 @@ DWORD WINAPI FormatMessage16(
/* CMF - This makes a BIG assumption about va_list */ while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { + LPSTR new_b; sz = (ret == -1 ? sz + 100 : ret + 1); - b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + new_b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + if (!new_b) break; + b = new_b; } for (x=b; *x; x++) ADD_TO_T(*x); HeapFree(GetProcessHeap(), 0, b);