Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by Thomas

Charles-François Natali · Charles-François Natali · commit 5a4a10969493 · 2011-09-29T19:46:37.000+02:00
Jarosch.
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -436,6 +436,7 @@ Bertrand Janin
 Geert Jansen
 Jack Jansen
 Bill Janssen
+Thomas Jarosch
 Drew Jenkins
 Flemming Kjær Jensen
 MunSic Jeong
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -82,6 +82,9 @@ Tests
 Extension Modules
 -----------------
 
+- Issue #13058: ossaudiodev: fix a file descriptor leak on error. Patch by
+  Thomas Jarosch.
+
 - Issue #13013: ctypes: Fix a reference leak in PyCArrayType_from_ctype.
   Thanks to Suman Saha for finding the bug and providing a patch.
 
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
@@ -129,6 +129,7 @@ newossobject(PyObject *arg)
     }
 
     if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) {
+        close(fd);
         PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ newossobject(PyObject *arg)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) {`
	`132`	`+ close(fd);`
`132`	`133`	`PyErr_SetFromErrnoWithFilename(PyExc_IOError, devicename);`
`133`	`134`	`return NULL;`
`134`	`135`	`}`