Re: [hhctrl.ocx] Null pointer fix, new patch

[Dmitry Timoshkov]

Jaroslav Šmíd <jardasmid(a)gmail.com> wrote:
> diff -urN Wine-git.orig/dlls/hhctrl.ocx/chm.c Wine-git/dlls/hhctrl.ocx/chm.c
> --- Wine-git.orig/dlls/hhctrl.ocx/chm.c	2010-06-22 12:41:54.034540000 +0200
> +++ Wine-git/dlls/hhctrl.ocx/chm.c	2010-06-22 12:51:07.454541388 +0200
> @@ -238,11 +238,11 @@
>          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;
>      }

The patch is wrapped.

-- 
Dmitry.