Changeset 1614 for trunk/src

Timestamp:

Nov 5, 1999, 1:57:36 PM (26 years ago)

Author:

phaller

Message:

Fix: TREEVIEW_Edit_Subclass is called with freed infoPtr

File:

• trunk/src/comctl32/treeview.c (modified) (14 diffs)

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.13 1999-11-02 21:44:04 achimha Exp $ */
+/* $Id: treeview.c,v 1.14 1999-11-05 12:53:06 phaller Exp $ */
 /* Treeview control
  *
@@ -51 +51 @@
 #include "treeview.h"
 
-
 /* ffs should be in <string.h>. */
 
@@ -966 +965 @@
     }
 
-    
+
     GetClientRect (hwnd, &rect);
     if ((rect.left-rect.right ==0) || (rect.top-rect.bottom==0)) return;
 
-    infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
+    infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
                                                 (hwnd, CDDS_PREPAINT, hdc, rect);
 
@@ -987 +986 @@
 
     /* draw background */
-    
+
     hbrBk = CreateSolidBrush (infoPtr->clrBk);
     FillRect(hdc, &rect, hbrBk);
@@ -1017 +1016 @@
 /* FIXME: remove this in later stage  */
 /*
-                if (wineItem->pszText!=LPSTR_TEXTCALLBACK32A) 
+                if (wineItem->pszText!=LPSTR_TEXTCALLBACK32A)
                 TRACE (treeview, "%d %d [%d %d %d %d] (%s)\n",y,x,
                         wineItem->rect.top, wineItem->rect.bottom,
                         wineItem->rect.left, wineItem->rect.right,
                         wineItem->pszText);
-                else 
+                else
                 TRACE (treeview, "%d [%d %d %d %d] (CALLBACK)\n",
                                 wineItem->hItem,
@@ -1079 +1078 @@
                         ShowScrollBar (hwnd, SB_VERT, TRUE);
                 infoPtr->uInternalStatus |=TV_VSCROLL;
-                SetScrollRange (hwnd, SB_VERT, 0, 
+                SetScrollRange (hwnd, SB_VERT, 0,
                                         y - infoPtr->uVisibleHeight, FALSE);
                 SetScrollPos (hwnd, SB_VERT, infoPtr->cy, TRUE);
         }
     else {
-                if (infoPtr->uInternalStatus & TV_VSCROLL) 
+                if (infoPtr->uInternalStatus & TV_VSCROLL)
                         ShowScrollBar (hwnd, SB_VERT, FALSE);
                 infoPtr->uInternalStatus &= ~TV_VSCROLL;
@@ -1090 +1089 @@
 
 
-        if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) 
-        infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify 
+        if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
+        infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
                                                                 (hwnd, CDDS_POSTPAINT, hdc, rect);
 
@@ -2020 +2019 @@
 }
 
+
+//@@@PH: Note - this SubclassProc is sometimes called with the
+//       wrong window handle. Therefore, infoPtr points to anything
+//       but the expected structure.
 LRESULT CALLBACK
 TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam,
@@ -2043 +2046 @@
     {
       TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
-      return CallWindowProcA( infoPtr->wpEditOrig, hwnd, uMsg, wParam, lParam);
+
+      //@@@PH 1999/11/05 method called with freed infoPtr memory object
+      if (infoPtr != NULL)
+        return CallWindowProcA( infoPtr->wpEditOrig, hwnd, uMsg, wParam, lParam);
+      else
+        break;
     }
   }
@@ -2176 +2184 @@
     infoPtr->himlNormal = NULL;
     infoPtr->himlState = NULL;
-        infoPtr->uItemHeight = -1;
+    infoPtr->uItemHeight = -1;
     GetTextMetricsA (hdc, &tm);
     infoPtr->hFont = GetStockObject (DEFAULT_GUI_FONT);
-        GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-        logFont.lfWeight=FW_BOLD;
+    GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
+    logFont.lfWeight=FW_BOLD;
     infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
@@ -2189 +2197 @@
     infoPtr->pCallBackSort=NULL;
     infoPtr->uScrollTime = 300; /* milliseconds */
+
+    // @@@PH 1999/11/05
+    infoPtr->wpEditOrig = NULL; /* no subclass */
 
 /*
@@ -2243 +2254 @@
                                     infoPtr->hwndEdit,
                                     GWL_WNDPROC,
-                                                                (LONG) TREEVIEW_Edit_SubclassProc);
+                                    (LONG) TREEVIEW_Edit_SubclassProc);
 
   ReleaseDC (hwnd, hdc);
@@ -2257 +2268 @@
 
 //   TRACE (treeview,"\n");
+
    TREEVIEW_RemoveTree (hwnd);
+
+   //@@@PH 1999/11/05 set infoPtr to NULL
+   SetWindowLongA( hwnd, 0, (DWORD)NULL);
+
    if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
         KillTimer (hwnd, TV_REFRESH_TIMER);
@@ -2264 +2280 @@
 
    COMCTL32_Free (infoPtr);
+
    return 0;
 }