Changeset 2893 for trunk/src

Timestamp:

Feb 25, 2000, 10:57:19 AM (26 years ago)

Author:

achimha

Message:

added infoPtr == NULL checks to prevent crashes

File:

• trunk/src/comctl32/tooltips.cpp (modified) (3 diffs)

trunk/src/comctl32/tooltips.cpp

@@ -1 @@
-/* $Id: tooltips.cpp,v 1.1 2000-02-23 17:09:49 cbratschi Exp $ */
+/* $Id: tooltips.cpp,v 1.2 2000-02-25 09:57:19 achimha Exp $ */
 /*
  * Tool tip control
@@ -526 +526 @@
     INT  nTool;
 
+    //@@@AH 2000/02/25 make sure we don't get garbage in
+    if (!infoPtr)
+    {
+      dprintf(("Tooltips:GetToolFromPoint: infoPtr == NULL!!!\n"));
+      return 0;
+    }
+
     for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) {
         toolPtr = &infoPtr->tools[nTool];
@@ -2232 +2239 @@
 
         case WM_MOUSEMOVE:
-            infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
+                infoPtr = TOOLTIPS_GetInfoPtr (lpttsi->hwndToolTip);
+                //@@@AH 2000/02/25 check if there is a valid instance data pointer
+                if (!infoPtr)
+                {
+                  dprintf(("Tooltips:SubclassProc:WM_MOUSEMOVE: infoPtr == NULL!\n"));
+                  break;
+                }
                 nTool = TOOLTIPS_GetToolFromMessage (infoPtr, hwnd);