Marcus Meissner : user32: Fixed NULL ptr checks (Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1667a2469e0c015ddb514ebb943b4329e549f5eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1667a2469e0c015ddb514ebb94...

Author: Marcus Meissner <marcus(a)jet.franken.de>
Date:   Mon Nov 23 22:14:44 2009 +0100

user32: Fixed NULL ptr checks (Coverity).

---

 dlls/user32/dde_misc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c
index d2de954..ae1df40 100644
--- 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 */