summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-09-28 07:25:53 +0000
committermartin <martin@NetBSD.org>2019-09-28 07:25:53 +0000
commitd0dd2989b05f3bf56113ec70807a66af51e2881e (patch)
tree793e76884513b1ee227482aca171e9b573f6b5f5 /usr.bin
parent470f77b4a7183a9fd9849eb45cdab8ec0eccb14a (diff)
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.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/audiocfg/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/audiocfg/main.c b/usr.bin/audiocfg/main.c
index 53c7861eaa7..83f87a7e876 100644
--- a/usr.bin/audiocfg/main.c
+++ b/usr.bin/audiocfg/main.c
@@ -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 <jmcneill@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]);