From 6691fa81edbe729da35869cd9526c1ca49a73970 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 22 May 1999 15:59:09 +0000 Subject: [PATCH] Authors: Chris Morgan , James Abbatiello Cleaner null pointer check in HEADER_InsertItemA and HEADER_InsertItemW. --- dlls/comctl32/header.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 7994e4b5573..a56bd07c1e6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -763,11 +763,8 @@ HEADER_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) if (phdi->mask & HDI_TEXT) { if (!phdi->pszText) /* null pointer check */ - { - lpItem->pszText = COMCTL32_Alloc(sizeof(WCHAR)); - lstrcpyAtoW(lpItem->pszText, ""); - } - else if (phdi->pszText != LPSTR_TEXTCALLBACKA) { + phdi->pszText = ""; + if (phdi->pszText != LPSTR_TEXTCALLBACKA) { len = lstrlenA (phdi->pszText); lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR)); lstrcpyAtoW (lpItem->pszText, phdi->pszText); @@ -851,12 +848,10 @@ HEADER_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) lpItem->cxy = phdi->cxy; if (phdi->mask & HDI_TEXT) { + WCHAR wide_null_char = 0; if (!phdi->pszText) /* null pointer check */ - { - lpItem->pszText = COMCTL32_Alloc(sizeof(WCHAR)); - lstrcpyAtoW(lpItem->pszText, ""); - } - else if (phdi->pszText != LPSTR_TEXTCALLBACKW) { + phdi->pszText = &wide_null_char; + if (phdi->pszText != LPSTR_TEXTCALLBACKW) { len = lstrlenW (phdi->pszText); lpItem->pszText = COMCTL32_Alloc ((len+1)*sizeof(WCHAR)); lstrcpyW (lpItem->pszText, phdi->pszText); -- 2.11.4.GIT