CVS commit: src/lib/libossaudio

[Nia Alarie]

Module Name:    src
Committed By:   nia
Date:           Tue Oct 20 06:53:38 UTC 2020

Modified Files:
        src/lib/libossaudio: ossaudio.c

Log Message:
ossaudio(3): Plug a fd leak in the new mixer API


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 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.52 src/lib/libossaudio/ossaudio.c:1.53
--- src/lib/libossaudio/ossaudio.c:1.52	Mon Oct 19 10:28:47 2020
+++ src/lib/libossaudio/ossaudio.c	Tue Oct 20 06:53:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ossaudio.c,v 1.52 2020/10/19 10:28:47 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.53 2020/10/20 06:53:37 nia Exp $	*/
 
 /*-
  * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.52 2020/10/19 10:28:47 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.53 2020/10/20 06:53:37 nia Exp $");
 
 /*
  * This is an Open Sound System compatibility layer, which provides
@@ -1328,9 +1328,9 @@ mixer_oss4_ioctl(int fd, unsigned long c
 			return newfd;
 		mdi.index = ei->ctrl - 1;
 		retval = ioctl(newfd, AUDIO_MIXER_DEVINFO, &mdi);
+		tmperrno = errno;
+		close(newfd);
 		if (retval < 0) {
-			tmperrno = errno;
-			close(newfd);
 			errno = tmperrno;
 			return retval;
 		}
@@ -1343,7 +1343,6 @@ mixer_oss4_ioctl(int fd, unsigned long c
 				ei->strindex[i] = noffs;
 				len = strlen(mdi.un.e.member[i].label.name) + 1;
 				if ((noffs + len) >= sizeof(ei->strings)) {
-				    close(newfd);
 				    errno = ENOMEM;
 				    return -1;
 				}
@@ -1359,7 +1358,6 @@ mixer_oss4_ioctl(int fd, unsigned long c
 				ei->strindex[i] = noffs;
 				len = strlen(mdi.un.s.member[i].label.name) + 1;
 				if ((noffs + len) >= sizeof(ei->strings)) {
-				    close(newfd);
 				    errno = ENOMEM;
 				    return -1;
 				}
@@ -1369,7 +1367,6 @@ mixer_oss4_ioctl(int fd, unsigned long c
 			}
 			break;
 		default:
-			close(newfd);
 			errno = EINVAL;
 			return -1;
 		}