Kirill Smirnov : winex11.drv: Avoid passing NULL to memcpy (clang).
Alexandre Julliard
julliard at winehq.org
Sun Jul 10 08:57:09 CDT 2016
Module: wine
Branch: master
Commit: 1b4e193473153dc9f4d4f4237b9a67564ada95d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e193473153dc9f4d4f4237b9a67564ada95d1
Author: Kirill Smirnov <kirill.k.smirnov at gmail.com>
Date: Fri Jul 8 01:50:27 2016 +0300
winex11.drv: Avoid passing NULL to memcpy (clang).
Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/xim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index e0548b8..e51169d 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -92,7 +92,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset,
ptr_new = CompositionString + byte_offset;
memmove(ptr_new + byte_length, ptr_new + byte_selection,
dwCompStringLength - byte_offset - byte_selection);
- memcpy(ptr_new, lpComp, byte_length);
+ if (lpComp) memcpy(ptr_new, lpComp, byte_length);
dwCompStringLength += byte_expansion;
IME_SetCompositionString(SCS_SETSTR, CompositionString,
More information about the wine-cvs
mailing list