wine/dlls/shell32 shfldr_unixfs.c

[Alexandre Julliard]

ChangeSet ID:	21020
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard(a)winehq.org	2005/11/01 12:06:18

Modified files:
	dlls/shell32   : shfldr_unixfs.c 

Log message:
	Michael Jung <mjung(a)iss.tu-darmstadt.de>
	Fixed crash in unixfs shellfolder handling with winamp.

Patch: http://cvs.winehq.org/patch.py?id=21020

Old revision  New revision  Changes     Path
 1.55          1.56          +5 -0       wine/dlls/shell32/shfldr_unixfs.c

Index: wine/dlls/shell32/shfldr_unixfs.c
diff -u -p wine/dlls/shell32/shfldr_unixfs.c:1.55 wine/dlls/shell32/shfldr_unixfs.c:1.56
--- wine/dlls/shell32/shfldr_unixfs.c:1.55	1 Nov 2005 18: 6:18 -0000
+++ wine/dlls/shell32/shfldr_unixfs.c	1 Nov 2005 18: 6:18 -0000
@@ -583,6 +583,11 @@ static HRESULT WINAPI UnixFolder_IShellF
     TRACE("(iface=%p, hwndOwner=%p, grfFlags=%08lx, ppEnumIDList=%p)\n", 
             iface, hwndOwner, grfFlags, ppEnumIDList);
 
+    if (!This->m_pszPath) {
+	WARN("EnumObjects called on uninitialized UnixFolder-object!\n");
+	return E_UNEXPECTED;
+    }
+
     newIterator = UnixSubFolderIterator_Constructor(This, grfFlags);
     hr = IUnknown_QueryInterface(newIterator, &IID_IEnumIDList, (void**)ppEnumIDList);
     IUnknown_Release(newIterator);