fix: incorrect conversion of ALSA frames to FrameCount on 32-bit platforms

roderickvd · roderickvd · commit 76b18c5fcb7e · 2025-11-28T22:33:34.000+01:00
Fixes #1053
diff --git a/src/host/alsa/mod.rs b/src/host/alsa/mod.rs
@@ -1193,9 +1193,10 @@ impl StreamTrait for Stream {
     }
 }
 
-// Overly safe clamp because alsa Frames are i64 (64-bit) or i32 (32-bit)
+// Convert ALSA frames to FrameCount, clamping to valid range.
+// ALSA Frames are i64 (64-bit) or i32 (32-bit).
 fn clamp_frame_count(buffer_size: alsa::pcm::Frames) -> FrameCount {
-    buffer_size.clamp(1, FrameCount::MAX as alsa::pcm::Frames) as FrameCount
+    buffer_size.max(1).try_into().unwrap_or(FrameCount::MAX)
 }
 
 fn hw_params_buffer_size_min_max(hw_params: &alsa::pcm::HwParams) -> (FrameCount, FrameCount) {

Original file line number	Diff line number	Diff line change
`@@ -1193,9 +1193,10 @@ impl StreamTrait for Stream {`
`1193`	`1193`	`}`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`		`-// Overly safe clamp because alsa Frames are i64 (64-bit) or i32 (32-bit)`
	`1196`	`+// Convert ALSA frames to FrameCount, clamping to valid range.`
	`1197`	`+// ALSA Frames are i64 (64-bit) or i32 (32-bit).`
`1197`	`1198`	`fn clamp_frame_count(buffer_size: alsa::pcm::Frames) -> FrameCount {`
`1198`		`- buffer_size.clamp(1, FrameCount::MAX as alsa::pcm::Frames) as FrameCount`
	`1199`	`+ buffer_size.max(1).try_into().unwrap_or(FrameCount::MAX)`
`1199`	`1200`	`}`
`1200`	`1201`
`1201`	`1202`	`fn hw_params_buffer_size_min_max(hw_params: &alsa::pcm::HwParams) -> (FrameCount, FrameCount) {`