Fixed a bug where a NULL primary buffer pointer is used when the

DirectSound object didn't create properly.

Fixed a bug where a NULL primary buffer pointer is used when the
8c37581d · Robert Reif · Alexandre Julliard · 369116d9 · 8c37581d
Commit 8c37581d authored Jul 28, 2003 by Robert Reif Committed by Alexandre Julliard Jul 28, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

dsound_main.c dlls/dsound/dsound_main.c +5 -1

No files found.
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -716,7 +716,9 @@ static ULONG WINAPI IDirectSoundImpl_Release(LPDIRECTSOUND8 iface) {
 		}

 		RtlReleaseResource(&(This->lock));
-		IDirectSoundBuffer8_Release((LPDIRECTSOUNDBUFFER8)This->primary);
+
+		if (This->primary)
+			IDirectSoundBuffer8_Release((LPDIRECTSOUNDBUFFER8)This->primary);

 		hres = DSOUND_PrimaryDestroy(This);
 		if (hres != DS_OK)
@@ -1112,6 +1114,8 @@ HRESULT WINAPI DirectSoundCreate8(LPCGUID lpcGUID,LPDIRECTSOUND8 *ppDS,IUnknown 
 	err = PrimaryBuffer_Create((*ippDS), (PrimaryBufferImpl**)&((*ippDS)->primary), &((*ippDS)->dsbd));
 	if ((*ippDS)->primary)
 		IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(*ippDS)->primary);
+	else 
+		WARN("PrimaryBuffer_Create failed\n");

 	return err;
 }