From b2eef842435bad7dcf09d2069fde7b1f14d7fa44 Mon Sep 17 00:00:00 2001
From: Jesper Nordenberg <jesper.nordenberg@gmail.com>
Date: Tue, 8 Oct 2024 14:17:14 +0200
Subject: [PATCH] Fixed memory leak

Fixed memory leak for parameter ppClosestMatch in call to IAudioClient::IsFormatSupported
---
 src/host/wasapi/device.rs | 56 +++++++++++++--------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/src/host/wasapi/device.rs b/src/host/wasapi/device.rs
index d0c03548b..ac12ee8f8 100644
--- a/src/host/wasapi/device.rs
+++ b/src/host/wasapi/device.rs
@@ -152,43 +152,25 @@ pub unsafe fn is_format_supported(
     waveformatex_ptr: *const Audio::WAVEFORMATEX,
 ) -> Result<bool, SupportedStreamConfigsError> {
     // Check if the given format is supported.
-    let is_supported = |waveformatex_ptr, closest_waveformatex_ptr| {
-        let result = client.IsFormatSupported(
-            Audio::AUDCLNT_SHAREMODE_SHARED,
-            waveformatex_ptr,
-            Some(closest_waveformatex_ptr),
-        );
-        // `IsFormatSupported` can return `S_FALSE` (which means that a compatible format
-        // has been found, but not an exact match) so we also treat this as unsupported.
-        match result {
-            Audio::AUDCLNT_E_DEVICE_INVALIDATED => {
-                Err(SupportedStreamConfigsError::DeviceNotAvailable)
-            }
-            r if r.is_err() => Ok(false),
-            Foundation::S_FALSE => Ok(false),
-            _ => Ok(true),
-        }
-    };
+    let mut closest_waveformatex_ptr: *mut Audio::WAVEFORMATEX = ptr::null_mut();
 
-    // First we want to retrieve a pointer to the `WAVEFORMATEX`.
-    // Although `GetMixFormat` writes the format to a given `WAVEFORMATEX` pointer,
-    // the pointer itself may actually point to a `WAVEFORMATEXTENSIBLE` structure.
-    // We check the wFormatTag to determine this and get a pointer to the correct type.
-    match (*waveformatex_ptr).wFormatTag as u32 {
-        Audio::WAVE_FORMAT_PCM | Multimedia::WAVE_FORMAT_IEEE_FLOAT => {
-            let mut closest_waveformatex = *waveformatex_ptr;
-            let mut closest_waveformatex_ptr = &mut closest_waveformatex as *mut _;
-            is_supported(waveformatex_ptr, &mut closest_waveformatex_ptr as *mut _)
-        }
-        KernelStreaming::WAVE_FORMAT_EXTENSIBLE => {
-            let waveformatextensible_ptr = waveformatex_ptr as *const Audio::WAVEFORMATEXTENSIBLE;
-            let mut closest_waveformatextensible = *waveformatextensible_ptr;
-            let closest_waveformatextensible_ptr = &mut closest_waveformatextensible as *mut _;
-            let mut closest_waveformatex_ptr =
-                closest_waveformatextensible_ptr as *mut Audio::WAVEFORMATEX;
-            is_supported(waveformatex_ptr, &mut closest_waveformatex_ptr as *mut _)
-        }
-        _ => Ok(false),
+    let result = client.IsFormatSupported(
+        Audio::AUDCLNT_SHAREMODE_SHARED,
+        waveformatex_ptr,
+        Some(&mut closest_waveformatex_ptr as *mut _),
+    );
+
+    if !closest_waveformatex_ptr.is_null() {
+        Com::CoTaskMemFree(Some(closest_waveformatex_ptr as *mut std::ffi::c_void));
+    }
+
+    // `IsFormatSupported` can return `S_FALSE` (which means that a compatible format
+    // has been found, but not an exact match) so we also treat this as unsupported.
+    match result {
+        Audio::AUDCLNT_E_DEVICE_INVALIDATED => Err(SupportedStreamConfigsError::DeviceNotAvailable),
+        r if r.is_err() => Ok(false),
+        Foundation::S_FALSE => Ok(false),
+        _ => Ok(true),
     }
 }
 
@@ -262,7 +244,7 @@ unsafe fn format_from_waveformatex_ptr(
     } else {
         SupportedBufferSize::Range {
             min: 0,
-            max: u32::max_value(),
+            max: u32::MAX,
         }
     };