dmloader: Avoid a crash on a NULL string pointer.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dmloader: Avoid a crash on a NULL string pointer.
ed6ee0f8 · Michael Stefaniuc · Alexandre Julliard · 3845b0bb · ed6ee0f8
Commit ed6ee0f8 authored Apr 27, 2017 by Michael Stefaniuc Committed by Alexandre Julliard Apr 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

loader.c dlls/dmloader/loader.c +6 -2

No files found.
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -536,12 +536,16 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *
 	WCHAR wszSearchString[MAX_PATH];
 	WCHAR *p;
 	HRESULT result;
-	TRACE("(%p, %s, %p, %p)\n", This, debugstr_dmguid(rguidClass), pwzFileExtension, pwzScanFileName);
+        TRACE("(%p, %s, %s, %s)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzFileExtension),
+                        debugstr_w(pwzScanFileName));
 	if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || !DMUSIC_IsValidLoadableClass(rguidClass)) {
 		ERR(": rguidClass invalid CLSID\n");
 		return REGDB_E_CLASSNOTREG;
 	}
-	
+
+        if (!pwzFileExtension)
+                return S_FALSE;
+
 	/* get search path for given class */
 	DMUSIC_GetLoaderSettings (iface, rguidClass, wszSearchString, NULL);