From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 3 Aug 2022 20:09:45 +0000 (+0200)
Subject: aplay: fix the capture file length regression
X-Git-Tag: v1.2.8~4
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=6ee086363a62c9692787860c1edf4f618ad1575a;p=alsa-utils.git

aplay: fix the capture file length regression

The commit 4b959a4 ("aplay: Fix for arecord recording ghost data")
intruduced a regression (file may contain more samples than
expected). Correct this.

Fixes: https://github.com/alsa-project/alsa-utils/issues/163
Fixes: 4b959a4 ("aplay: Fix for arecord recording ghost data")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/aplay/aplay.c b/aplay/aplay.c
index b3b3635..e063aa7 100644
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -2268,7 +2268,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount)
 		}
 	}
 abort:
-	return result;
+	return result > rcount ? rcount : result;
 }
 
 static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)