Module: wine Branch: master Commit: 19d29f3ca58f4f574747ff7e6aadb20160b4bebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d29f3ca58f4f574747ff7e6a...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Nov 23 17:31:21 2015 +0300
user32: Don't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() (Coverity).
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user32/dde_misc.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d66d2e0..175d9e3 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -2468,7 +2468,10 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) }
if (ret != 0) + { + ci.cb = lpConvInfo->cb; memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); + } return ret; }