Make SHGetPathFromIDList check for null pointer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The .NET redistributable gives a null pointer as a buffer in the
BROWSEINFO struct, causing Wine to crash when you hit "OK" on the
"choose a folder" dialog.

ChangeLog:

- Make SHGetPathFromIDList functions ensure pszPath isn't NULL

thanks -mike

-- 
Mike Hearn <m.hearn@signal.qinetiq.com>
QinetiQ - Malvern Technology Center
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.c,v
retrieving revision 1.80
diff -u -r1.80 pidl.c
--- dlls/shell32/pidl.c	16 Dec 2002 23:48:30 -0000	1.80
+++ dlls/shell32/pidl.c	24 Feb 2003 15:29:17 -0000
@@ -923,7 +923,8 @@
 	pdump(pidl);
 
 	if (!pidl) return FALSE;
-
+	if (!pszPath) return FALSE;
+	  
 	hr = SHGetDesktopFolder(&shellfolder);
 	if (SUCCEEDED (hr)) {
 	    hr = IShellFolder_GetDisplayNameOf(shellfolder,pidl,SHGDN_FORPARSING,&str);
@@ -949,6 +950,7 @@
 	pdump(pidl);
 
 	if (!pidl) return FALSE;
+	if (!pszPath) return FALSE;
 
 	hr = SHGetDesktopFolder(&shellfolder);
 	if (SUCCEEDED(hr)) {

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux