CVS commit: [netbsd-9] src/usr.bin/audiocfg

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sat Sep 28 07:25:53 UTC 2019

Modified Files:
        src/usr.bin/audiocfg [netbsd-9]: main.c

Log Message:
Pull up following revision(s) (requested by isaki in ticket #258):

        usr.bin/audiocfg/main.c: revision 1.9

Fix assertion of "audiocfg list <n>" when n is an illegal index.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.bin/audiocfg/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/audiocfg/main.c
diff -u src/usr.bin/audiocfg/main.c:1.8 src/usr.bin/audiocfg/main.c:1.8.2.1
--- src/usr.bin/audiocfg/main.c:1.8	Wed May  8 14:36:12 2019
+++ src/usr.bin/audiocfg/main.c	Sat Sep 28 07:25:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2019/05/08 14:36:12 isaki Exp $ */
+/* $NetBSD: main.c,v 1.8.2.1 2019/09/28 07:25:53 martin Exp $ */
 
 /*
  * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -164,7 +164,12 @@ main(int argc, char *argv[])
 		if (errno)
 			usage(argv[0]);
 			/* NOTREACHED */
-		print_audiodev(audiodev_get(i), i);
+		adev = audiodev_get(i);
+		if (adev == NULL) {
+			fprintf(stderr, "no such device\n");
+			return EXIT_FAILURE;
+		}
+		print_audiodev(adev, i);
 	} else if (strcmp(argv[1], "default") == 0 && argc == 3) {
 		if (*argv[2] < '0' || *argv[2] > '9')
 			usage(argv[0]);