lad_dealloc(): if xp->x_fd == -1, it means the descriptor's already

bwarsaw · bwarsaw · commit 28d98825bd5a · 2000-08-18T05:10:45.000Z
been closed. Don't try to reclose it. Found by Insure. git-svn-id: http://svn.python.org/projects/python/trunk@16873 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
@@ -110,7 +110,9 @@ newladobject(PyObject *arg)
 static void
 lad_dealloc(lad_t *xp)
 {
-    close(xp->x_fd);
+    /* if already closed, don't reclose it */
+    if (xp->x_fd != -1)
+	close(xp->x_fd);
     PyObject_Del(xp);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,9 @@ newladobject(PyObject *arg)`
`110`	`110`	`static void`
`111`	`111`	`lad_dealloc(lad_t *xp)`
`112`	`112`	`{`
`113`		`- close(xp->x_fd);`
	`113`	`+ /* if already closed, don't reclose it */`
	`114`	`+ if (xp->x_fd != -1)`
	`115`	`+ close(xp->x_fd);`
`114`	`116`	`PyObject_Del(xp);`
`115`	`117`	`}`
`116`	`118`