comctl32: Fix read of uninitialized data in LISTVIEW_GetItemExtT when LVIF_TEXT is not set (Valgrind).

Alexander Scott-Johns alexander.scott.johns at googlemail.com
Fri Feb 18 18:34:22 CST 2011


-------------- next part --------------
From ef8b0ac84473c02f788f83fdf018d911fe030248 Mon Sep 17 00:00:00 2001
From: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date: Fri, 18 Feb 2011 13:42:56 +0000
Subject: comctl32: Fix read of uninitialized data in LISTVIEW_GetItemExtT when LVIF_TEXT is not set (Valgrind).

---
 dlls/comctl32/listview.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index dc96200..25c42c5 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -6741,6 +6741,9 @@ static BOOL LISTVIEW_GetItemExtT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte
     if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount)
 	return FALSE;
 
+    if (!(lpLVItem->mask & LVIF_TEXT))
+        return LISTVIEW_GetItemT(infoPtr, lpLVItem, isW);
+
     pszText = lpLVItem->pszText;
     bResult = LISTVIEW_GetItemT(infoPtr, lpLVItem, isW);
     if (bResult && lpLVItem->pszText != pszText)
-- 
1.7.0.4


More information about the wine-patches mailing list