Check variable before using it

elishacloud · Jun 27, 2024 · c43b54b · c43b54b
1 parent 831a4b2
commit c43b54b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/BuildNo.rc b/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 75 
+#define BUILD_NUMBER 76 
diff --git a/IDirectInputDeviceX.cpp b/IDirectInputDeviceX.cpp
@@ -694,6 +694,12 @@ HRESULT m_IDirectInputDeviceX::CreateEffect(REFGUID rguid, LPCDIEFFECT lpeff, LP
 {
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ") Trying! " << rguid << " " << punkOuter;
 
+	if (!ppdeff)
+	{
+		return DIERR_INVALIDPARAM;
+	}
+	*ppdeff = nullptr;
+
 	DIEFFECT eff = {};
 	if (lpeff && lpeff->dwSize == sizeof(DIEFFECT_DX5))
 	{
@@ -704,7 +710,7 @@ HRESULT m_IDirectInputDeviceX::CreateEffect(REFGUID rguid, LPCDIEFFECT lpeff, LP
 
 	HRESULT hr = ProxyInterface->CreateEffect(rguid, lpeff, ppdeff, punkOuter);
 
-	if (SUCCEEDED(hr) && ppdeff)
+	if (SUCCEEDED(hr))
 	{
 		m_IDirectInputEffect* pEffect = new m_IDirectInputEffect((IDirectInputEffect*)*ppdeff);
 		pEffect->SetVersion(diVersion);