Bruno Jesus : comctl32: Respect an assert in TREEVIEW_RemoveAllChildren.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 23 09:59:47 CST 2015


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

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Mon Nov 23 21:47:56 2015 +0800

comctl32: Respect an assert in TREEVIEW_RemoveAllChildren.

Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/treeview.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 6adafc4..dc19655 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -1441,11 +1441,13 @@ TREEVIEW_RemoveAllChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *parentIt
 static void
 TREEVIEW_UnlinkItem(const TREEVIEW_ITEM *item)
 {
-    TREEVIEW_ITEM *parentItem = item->parent;
+    TREEVIEW_ITEM *parentItem;
 
     assert(item != NULL);
     assert(item->parent != NULL); /* i.e. it must not be the root */
 
+    parentItem = item->parent;
+
     if (parentItem->firstChild == item)
 	parentItem->firstChild = item->nextSibling;
 




More information about the wine-cvs mailing list