commit 7a9a2aa1044683dec4c22d3534eed5d968cbf647
author Serge Ivanov <sergei@corel.com> Thu Oct 12 23:08:19 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 12 23:08:19 2000 +0000
tree 24c1c4eb87e92a5360793a2346e60d0bec6a4fdd
parent 163830c5694fbfbcf09c22ba37e77afe7b9653a6

Simple NULL check.

dlls/comctl32/header.c

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 3906ac6..b4555ef 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -651,8 +651,12 @@
 	phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
-	    lstrcpynWtoA (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
+	if (lpItem->pszText != LPSTR_TEXTCALLBACKW) {
+	    if (lpItem->pszText)
+		lstrcpynWtoA (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
+	    else
+	        *phdi->pszText = 0;
+	}	
 	else
 	    phdi->pszText = LPSTR_TEXTCALLBACKA;
     }
@@ -699,8 +703,12 @@
 	phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_TEXT) {
-	if (lpItem->pszText != LPSTR_TEXTCALLBACKW)
-	    lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
+	if (lpItem->pszText != LPSTR_TEXTCALLBACKW) {
+	    if (lpItem->pszText)
+	        lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax);
+	    else
+	        *phdi->pszText = 0;
+	}
 	else
 	    phdi->pszText = LPSTR_TEXTCALLBACKW;
     }