Jaroslav Šmíd : hhctrl.ocx: Make sure pszCaption and pszFile are never 0.

[Alexandre Julliard]

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

Author: Jaroslav Šmíd 
Date:   Sat Jun 26 22:24:04 2010 +0200

hhctrl.ocx: Make sure pszCaption and pszFile are never 0.

---

dlls/hhctrl.ocx/chm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index 4c85bd9..f0452fa 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
         info->WinType.pszIndex = strdupW(null);
         info->WinType.fsValidMembers=0;
         info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE;
-        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle);
+        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null);
         info->WinType.dwStyles=WS_POPUP;
         info->WinType.dwExStyles=0;
         info->WinType.nShowState=SW_SHOW;
-        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic);
+        info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null);
         info->WinType.curNavType=HHWIN_NAVTYPE_TOC;
         return TRUE;
     }