user32: Fixed NULL ptr checks (Coverity).

1667a246 · Marcus Meissner · Alexandre Julliard · 9718e047 · 1667a246
Commit 1667a246 authored Nov 23, 2009 by Marcus Meissner Committed by Alexandre Julliard Nov 24, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

dde_misc.c dlls/user32/dde_misc.c +7 -1

No files found.
--- a/dlls/user32/dde_misc.c
+++ b/dlls/user32/dde_misc.c
@@ -1983,7 +1983,13 @@ WDML_CONV*	WDML_GetConv(HCONV hConv, BOOL checkConnected)
    /* FIXME: should do better checking */
    if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL;

-    if (!pConv->instance || pConv->instance->threadID != GetCurrentThreadId())
+    if (!pConv->instance)
+    {
+        WARN("wrong thread ID, no instance\n");
+	return NULL;
+    }
+
+    if (pConv->instance->threadID != GetCurrentThreadId())
    {
        WARN("wrong thread ID\n");
        pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */