comctl32: Allocate new memory in notify_forward_header() to avoid Free() on…

comctl32: Allocate new memory in notify_forward_header() to avoid Free() on wrong pointer. (Valgrind).

comctl32: Allocate new memory in notify_forward_header() to avoid Free() on…
392321f4 · Sebastian Lackner · Alexandre Julliard · e5e4ef07 · 392321f4
Commit 392321f4 authored Jun 22, 2014 by Sebastian Lackner Committed by Alexandre Julliard Jun 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

listview.c dlls/comctl32/listview.c +2 -0

No files found.
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -784,6 +784,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp
        if (lpnmh->pitem->mask & HDI_TEXT)
        {
            text = (LPCWSTR)lpnmh->pitem->pszText;
+            lpnmh->pitem->pszText = NULL;
            Str_SetPtrWtoA(&lpnmh->pitem->pszText, text);
        }
        /* convert filter text */
@@ -791,6 +792,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp
             lpnmh->pitem->pvFilter)
        {
            filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText;
+            ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL;
            Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter);
        }
    }