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

Alexandre Julliard julliard at winehq.org
Mon Feb 21 10:56:57 CST 2011


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

Author: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date:   Fri Feb 18 13:42:56 2011 +0000

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

---

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

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index dc96200..4dad175 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -6743,7 +6743,7 @@ static BOOL LISTVIEW_GetItemExtT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte
 
     pszText = lpLVItem->pszText;
     bResult = LISTVIEW_GetItemT(infoPtr, lpLVItem, isW);
-    if (bResult && lpLVItem->pszText != pszText)
+    if (bResult && (lpLVItem->mask & LVIF_TEXT) && lpLVItem->pszText != pszText)
     {
 	if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW)
 	    textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax);




More information about the wine-cvs mailing list