Check for NULL before doing IsEqualGUID().

34c9f9fb · Marcus Meissner · Alexandre Julliard · aaa78f9c · 34c9f9fb
Commit 34c9f9fb authored Dec 16, 2000 by Marcus Meissner Committed by Alexandre Julliard Dec 16, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

main.c dlls/ddraw/main.c +5 -3

No files found.
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -316,9 +316,11 @@ HRESULT WINAPI DirectDrawCreate(
 	ddraw_drivers[drvindex] = NULL; /* mark this one as unusable */
    }
-    if (IsEqualGUID( &IID_IDirectDraw2, lpGUID ) ||
+    if (lpGUID &&
-	IsEqualGUID( &IID_IDirectDraw4, lpGUID ) ||
+	(IsEqualGUID( &IID_IDirectDraw2, lpGUID ) ||
-	IsEqualGUID( &IID_IDirectDraw7, lpGUID )
+	 IsEqualGUID( &IID_IDirectDraw4, lpGUID ) ||
+	 IsEqualGUID( &IID_IDirectDraw7, lpGUID )
+	)
    ) {
 	LPVOID x;
 	ret = IDirectDraw_QueryInterface(*lplpDD,lpGUID,&x);