ALSA: Fix a potential infinite loop in MMAP mode.

b250bcdf · David Reid · 4f85fb86 · b250bcdf
Commit b250bcdf authored Jul 14, 2018 by David Reid
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

mini_al.h mini_al.h +10 -3

No files found.
--- a/mini_al.h
+++ b/mini_al.h
@@ -9746,7 +9746,6 @@ mal_bool32 mal_device_write__alsa(mal_device* pDevice)
        return MAL_FALSE;
    }

-
    if (pDevice->alsa.isUsingMMap) {
        // mmap.
        mal_bool32 requiresRestart;
@@ -9786,7 +9785,11 @@ mal_bool32 mal_device_write__alsa(mal_device* pDevice)
                }
            }

-            framesAvailable -= mappedFrames;
+            if (framesAvailable >= mappedFrames) {
+                framesAvailable -= mappedFrames;
+            } else {
+                framesAvailable = 0;
+            }
        }
    } else {
        // readi/writei.
@@ -9880,7 +9883,11 @@ mal_bool32 mal_device_read__alsa(mal_device* pDevice)
                }
            }

-            framesAvailable -= mappedFrames;
+            if (framesAvailable >= mappedFrames) {
+                framesAvailable -= mappedFrames;
+            } else {
+                framesAvailable = 0;
+            }
        }
    } else {
        // readi/writei.