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

2010-06-27 Thread James McKenzie
Jaroslav Šmíd wrote: On Wed, Jun 23, 2010 at 6:50 AM, Dmitry Timoshkov wrote: Jaroslav Šmíd 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.03454 +0200 +++ Wine-git/dlls/hhctrl.

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

2010-06-26 Thread Jaroslav Šmíd
On Wed, Jun 23, 2010 at 6:50 AM, Dmitry Timoshkov wrote: > Jaroslav Šmíd 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.03454 >> +0200 >> +++ Wine-git/dlls/hhctrl.ocx/chm.c    2010-

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

2010-06-22 Thread Dmitry Timoshkov
Jaroslav Šmíd 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.03454 > +0200 > +++ Wine-git/dlls/hhctrl.ocx/chm.c2010-06-22 12:51:07.454541388 +0200 > @@ -238,11 +238,11 @@ >

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

2010-06-22 Thread Jaroslav Šmíd
There is actually variable named "null" in the original source code, just read the whole function. It contains one character - terminating null. patch fixes http://bugs.winehq.org/show_bug.cgi?id=23247, see it for more information. On Tue, Jun 22, 2010 at 1:09 PM, Andrew Nguyen wrote: > On Tue, J

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

2010-06-22 Thread Andrew Nguyen
On Tue, Jun 22, 2010 at 6:13 AM, Nikolay Sivov wrote: > On 6/22/2010 15:09, Andrew Nguyen wrote: >> >> On Tue, Jun 22, 2010 at 5:56 AM, Jaroslav Šmíd >>  wrote: >> >>> >>> -        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); >>> +        info->WinType.pszCaption=strdupW(info->pCHMI

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

2010-06-22 Thread Nikolay Sivov
On 6/22/2010 15:09, Andrew Nguyen wrote: On Tue, Jun 22, 2010 at 5:56 AM, Jaroslav Šmíd wrote: -info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); +info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); Perhaps I am miss

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

2010-06-22 Thread Andrew Nguyen
On Tue, Jun 22, 2010 at 5:56 AM, Jaroslav Šmíd wrote: > -        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); > +        info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? > info->pCHMInfo->defTitle : null); Perhaps I am missing something obvious, but isn't the new stateme