From 60e414fb65884f1fea7a9988856b589544493357 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 24 Apr 1999 11:51:13 +0000 Subject: [PATCH] Authors: Chris Morgan , James Abbatiello HEADER_InsertItemA and HEADER_InsertItemW now treat null pointers to text strings as null strings, as Windows does. Fixes wine crash on startup of CuteFTP. --- dlls/comctl32/header.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 82fe3959884..f28b5b5cac8 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -762,6 +762,8 @@ HEADER_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) lpItem->cxy = phdi->cxy; if (phdi->mask & HDI_TEXT) { + if (!phdi->pszText) /* null pointer check */ + phdi->pszText = ""; if (phdi->pszText != LPSTR_TEXTCALLBACKA) { len = lstrlenA (phdi->pszText); lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR)); @@ -846,6 +848,8 @@ HEADER_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) lpItem->cxy = phdi->cxy; if (phdi->mask & HDI_TEXT) { + if (!phdi->pszText) /* null pointer check */ + phdi->pszText = ""; if (phdi->pszText != LPSTR_TEXTCALLBACKW) { len = lstrlenW (phdi->pszText); lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR)); -- 2.11.4.GIT