[src/trunk]: src/usr.bin/audio/record audiorecord(1): Handle read(2) return v...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08bd48a6441a
branches:  trunk
changeset: 1021490:08bd48a6441a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Jun 01 21:08:48 2021 +0000

description:
audiorecord(1): Handle read(2) return value gracefully.

diffstat:

 usr.bin/audio/record/record.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r ca512818f939 -r 08bd48a6441a usr.bin/audio/record/record.c
--- a/usr.bin/audio/record/record.c     Tue Jun 01 16:55:07 2021 +0000
+++ b/usr.bin/audio/record/record.c     Tue Jun 01 21:08:48 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: record.c,v 1.54 2015/08/05 06:54:39 mrg Exp $  */
+/*     $NetBSD: record.c,v 1.55 2021/06/01 21:08:48 riastradh Exp $    */
 
 /*
  * Copyright (c) 1999, 2002, 2003, 2005, 2010 Matthew R. Green
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: record.c,v 1.54 2015/08/05 06:54:39 mrg Exp $");
+__RCSID("$NetBSD: record.c,v 1.55 2021/06/01 21:08:48 riastradh Exp $");
 #endif
 
 
@@ -81,6 +81,7 @@
 {
        u_char  *buffer;
        size_t  len, bufsize = 0;
+       ssize_t nread;
        int     ch, no_time_limit = 1;
        const char *defdevice = _PATH_SOUND;
 
@@ -337,8 +338,12 @@
 
        (void)gettimeofday(&start_time, NULL);
        while (no_time_limit || timeleft(&start_time, &record_time)) {
-               if ((size_t)read(audiofd, buffer, bufsize) != bufsize)
+               if ((nread = read(audiofd, buffer, bufsize)) == -1)
                        err(1, "read failed");
+               if (nread == 0)
+                       errx(1, "read eof");
+               if ((size_t)nread != bufsize)
+                       errx(1, "invalid read");
                if (conv_func)
                        (*conv_func)(buffer, bufsize);
                if ((size_t)write(ti.outfd, buffer, bufsize) != bufsize)