Module Name: src
Committed By: nia
Date: Tue Nov 3 08:24:33 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio(3): return correctly initialized return value in unlikely
error case. pointed out by tnn.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.59 src/lib/libossaudio/ossaudio.c:1.60
--- src/lib/libossaudio/ossaudio.c:1.59 Fri Oct 30 21:44:49 2020
+++ src/lib/libossaudio/ossaudio.c Tue Nov 3 08:24:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.60 2020/11/03 08:24:33 nia Exp $ */
/*-
* Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.60 2020/11/03 08:24:33 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@@ -187,9 +187,9 @@ audio_ioctl(int fd, unsigned long com, v
INTARG = 192000;
tmpinfo.play.sample_rate =
tmpinfo.record.sample_rate = INTARG;
- if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
+ retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+ if (retval < 0)
return retval;
- }
/* FALLTHRU */
case SOUND_PCM_READ_RATE:
retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
