x11drv: ime: In the update functions if we get a null string with a len report…

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).

x11drv: ime: In the update functions if we get a null string with a len report…
6d652ddc · Aric Stewart · Alexandre Julliard · ea085768 · 6d652ddc
Commit 6d652ddc authored Oct 02, 2008 by Aric Stewart Committed by Alexandre Julliard Oct 06, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

ime.c dlls/winex11.drv/ime.c +12 -0

No files found.
--- 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);