Re: WINE Regression due to patch applied Feb 22, 2005 10:50 CDT

[Mike McCormack]

Arren Lex wrote:
Unfortunately, the patch you sent me didn't seem to have any effect on 
the application. It still crashes with exactly the same error. Here's a 
new backtrace if it helps.

Does this patch do any better?  (you'll need to back out the other one 
first...)

cd ~/wine
patch -p0 -R < getpps-null.diff
patch -p0 < getpps-null-2.diff
make

thanks,

Mike
Index: dlls/kernel/profile.c
===================================================================
RCS file: /home/mike/src/wine-cvs/wine/dlls/kernel/profile.c,v
retrieving revision 1.28
diff -u -p -r1.28 profile.c
--- dlls/kernel/profile.c	9 Sep 2005 10:19:45 -0000	1.28
+++ dlls/kernel/profile.c	10 Oct 2005 06:09:28 -0000
@@ -1112,10 +1112,12 @@ static int PROFILE_GetPrivateProfileStri
 	else 
 	    /* PROFILE_GetString can handle the 'entry == NULL' case */
             ret = PROFILE_GetString( section, entry, pDefVal, buffer, len, win32 );
-    } else {
+    } else if (buffer && pDefVal) {
        lstrcpynW( buffer, pDefVal, len );
        ret = strlenW( buffer );
     }
+    else
+       ret = 0;
 
     RtlLeaveCriticalSection( &PROFILE_CritSect );