[hhctrl.ocx] Null pointer fix, new patch

James McKenzie jjmckenzie51 at earthlink.net
Sun Jun 27 19:16:36 CDT 2010


Jaroslav Šmíd wrote:
> On Wed, Jun 23, 2010 at 6:50 AM, Dmitry Timoshkov
> <dmitry at codeweavers.com> wrote:
>   
>> Jaroslav Šmíd <jardasmid at 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.
>>
>>     
>
> What does it mean it is wrapped? Accepted or not? If not, why?
>
>   
Your mailer wrapped lines.  This will NOT APPLY.

You need to attach the patches to your messages.

James McKenzie




More information about the wine-devel mailing list