comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when…

comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified. Signed-off-by: Piotr Caban <piotr@codeweavers.com>

comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when…
9c87c7e7 · Piotr Caban · Alexandre Julliard · c565145b · 9c87c7e7
Commit 9c87c7e7 authored Oct 07, 2015 by Piotr Caban Committed by Alexandre Julliard Oct 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

listview.c dlls/comctl32/listview.c +12 -4

No files found.
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -7851,10 +7851,18 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
    item.iItem = nItem;
    if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
    {
-        item.mask |= LVIF_STATE;
-        item.stateMask |= LVIS_STATEIMAGEMASK;
-        item.state &= ~LVIS_STATEIMAGEMASK;
-        item.state |= INDEXTOSTATEIMAGEMASK(1);
+        if (item.mask & LVIF_STATE)
+        {
+            item.stateMask |= LVIS_STATEIMAGEMASK;
+            item.state &= ~LVIS_STATEIMAGEMASK;
+            item.state |= INDEXTOSTATEIMAGEMASK(1);
+        }
+        else
+        {
+            item.mask |= LVIF_STATE;
+            item.stateMask = LVIS_STATEIMAGEMASK;
+            item.state = INDEXTOSTATEIMAGEMASK(1);
+        }
    }

    if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;