From 60a20eaf32bba5531bcf974153249ccaf6087e66 Mon Sep 17 00:00:00 2001
From: Eric Pouech <eric.pouech@wanadoo.fr>
Date: Mon, 7 Oct 2002 18:21:03 +0000
Subject: [PATCH] Fixed some NULL pointer handling errors.

---
 dlls/user/dde/ddeml16.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/user/dde/ddeml16.c b/dlls/user/dde/ddeml16.c
index a6d5ff4e92f..78c03db16a5 100644
--- a/dlls/user/dde/ddeml16.c
+++ b/dlls/user/dde/ddeml16.c
@@ -101,7 +101,7 @@ HDDEDATA	WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt,
                                       HCONV hConv, HSZ hsz1, HSZ hsz2,
                                       HDDEDATA hdata, DWORD dwData1, DWORD dwData2)
 {
-    DWORD               d1;
+    DWORD               d1 = 0;
     HDDEDATA            ret;
     CONVCONTEXT16       cc16;
 
@@ -109,8 +109,12 @@ HDDEDATA	WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt,
     {
     case XTYP_CONNECT:
     case XTYP_WILDCONNECT:
-        map3216_conv_context(&cc16, (const CONVCONTEXT*)dwData1);
-        d1 = MapLS(&cc16);
+        if (dwData1)
+        {
+            map3216_conv_context(&cc16, (const CONVCONTEXT*)dwData1);
+            d1 = MapLS(&cc16);
+        }
+        else
         break;
     default:
         d1 = dwData1;
@@ -122,7 +126,7 @@ HDDEDATA	WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt,
     {
     case XTYP_CONNECT:
     case XTYP_WILDCONNECT:
-        UnMapLS(d1);
+        if (d1 != 0) UnMapLS(d1);
         break;
     }
     return ret;