From 6d652ddc4f2b3ee011031e67e644f28f5d61959c Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Thu, 2 Oct 2008 10:43:13 -0500 Subject: [PATCH] x11drv: ime: In the update functions if we get a null string with a len report this and fix len to be 0 (Coverity 656 and 655). --- dlls/winex11.drv/ime.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ab94864f41d..b934035a3c0 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -207,6 +207,12 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) if (old == NULL && compstr == NULL && len == 0) return NULL; + if (compstr == NULL && len != 0) + { + ERR("compstr is NULL however we have a len! Please report\n"); + len = 0; + } + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -343,6 +349,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) if (old == NULL && resultstr == NULL && len == 0) return NULL; + if (resultstr == NULL && len != 0) + { + ERR("resultstr is NULL however we have a len! Please report\n"); + len = 0; + } + if (old != NULL) { olddata = ImmLockIMCC(old); -- 2.11.4.GIT