[Python-checkins] cpython: Issue #12287: In ossaudiodev, check that the device isn't closed in several

Sat Jun 11 18:58:25 CEST 2011

http://hg.python.org/cpython/rev/d0952a2fb7bd
changeset: 70788:d0952a2fb7bd
user: Charles-François Natali <neologix at free.fr>
date: Sat Jun 11 18:58:24 2011 +0200
summary:
 Issue #12287: In ossaudiodev, check that the device isn't closed in several
methods.
files:
 Lib/test/test_ossaudiodev.py | 16 ++++
 Misc/NEWS | 3 +
 Modules/ossaudiodev.c | 91 ++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_ossaudiodev.py b/Lib/test/test_ossaudiodev.py
--- a/Lib/test/test_ossaudiodev.py
+++ b/Lib/test/test_ossaudiodev.py
@@ -170,6 +170,22 @@
 pass
 self.assertTrue(dsp.closed)
 
+ def test_on_closed(self):
+ dsp = ossaudiodev.open('w')
+ dsp.close()
+ self.assertRaises(ValueError, dsp.fileno)
+ self.assertRaises(ValueError, dsp.read, 1)
+ self.assertRaises(ValueError, dsp.write, b'x')
+ self.assertRaises(ValueError, dsp.writeall, b'x')
+ self.assertRaises(ValueError, dsp.bufsize)
+ self.assertRaises(ValueError, dsp.obufcount)
+ self.assertRaises(ValueError, dsp.obufcount)
+ self.assertRaises(ValueError, dsp.obuffree)
+ self.assertRaises(ValueError, dsp.getptr)
+
+ mixer = ossaudiodev.openmixer()
+ mixer.close()
+ self.assertRaises(ValueError, mixer.fileno)
 
 def test_main():
 try:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -187,6 +187,9 @@
 Library
 -------
 
+- Issue #12287: In ossaudiodev, check that the device isn't closed in several
+ methods.
+
 - Issue #12009: Fixed regression in netrc file comment handling.
 
 - Issue #12246: Warn and fail when trying to install a third-party project from
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -213,6 +213,21 @@
 * Helper functions
 */
 
+/* Check if a given file descriptor is valid (i.e. hasn't been closed).
+ * If true, return 1. Otherwise, raise ValueError and return 0.
+ */
+static int _is_fd_valid(int fd)
+{
+ /* the FD is set to -1 in oss_close()/oss_mixer_close() */
+ if (fd >= 0) {
+ return 1;
+ } else {
+ PyErr_SetString(PyExc_ValueError,
+ "Operation on closed OSS device.");
+ return 0;
+ }
+}
+
 /* _do_ioctl_1() is a private helper function used for the OSS ioctls --
 SNDCTL_DSP_{SETFMT,CHANNELS,SPEED} -- that that are called from C
 like this:
@@ -300,6 +315,9 @@
 static PyObject *
 oss_nonblock(oss_audio_t *self, PyObject *unused)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 /* Hmmm: it doesn't appear to be possible to return to blocking
 mode once we're in non-blocking mode! */
 if (ioctl(self->fd, SNDCTL_DSP_NONBLOCK, NULL) == -1)
@@ -311,6 +329,9 @@
 static PyObject *
 oss_setfmt(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1(self->fd, args, "setfmt", SNDCTL_DSP_SETFMT);
 }
 
@@ -318,6 +339,10 @@
 oss_getfmts(oss_audio_t *self, PyObject *unused)
 {
 int mask;
+
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (ioctl(self->fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
 return PyErr_SetFromErrno(PyExc_IOError);
 return PyLong_FromLong(mask);
@@ -326,30 +351,45 @@
 static PyObject *
 oss_channels(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1(self->fd, args, "channels", SNDCTL_DSP_CHANNELS);
 }
 
 static PyObject *
 oss_speed(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1(self->fd, args, "speed", SNDCTL_DSP_SPEED);
 }
 
 static PyObject *
 oss_sync(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_0(self->fd, args, "sync", SNDCTL_DSP_SYNC);
 }
 
 static PyObject *
 oss_reset(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_0(self->fd, args, "reset", SNDCTL_DSP_RESET);
 }
 
 static PyObject *
 oss_post(oss_audio_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_0(self->fd, args, "post", SNDCTL_DSP_POST);
 }
 
@@ -364,6 +404,9 @@
 char *cp;
 PyObject *rv;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (!PyArg_ParseTuple(args, "i:read", &size))
 return NULL;
 rv = PyBytes_FromStringAndSize(NULL, size);
@@ -391,6 +434,9 @@
 char *cp;
 int rv, size;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (!PyArg_ParseTuple(args, "y#:write", &cp, &size)) {
 return NULL;
 }
@@ -422,6 +468,9 @@
 mode, the behaviour of write() and writeall() from Python is
 indistinguishable. */
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (!PyArg_ParseTuple(args, "y#:write", &cp, &size))
 return NULL;
 
@@ -489,6 +538,9 @@
 static PyObject *
 oss_fileno(oss_audio_t *self, PyObject *unused)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return PyLong_FromLong(self->fd);
 }
 
@@ -503,6 +555,9 @@
 int fmt, channels, rate;
 PyObject * rv; /* return tuple (fmt, channels, rate) */
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (!PyArg_ParseTuple(args, "iii|i:setparameters",
 &wanted_fmt, &wanted_channels, &wanted_rate,
 &strict))
@@ -593,6 +648,9 @@
 audio_buf_info ai;
 int nchannels=0, ssize=0;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (_ssize(self, &nchannels, &ssize) < 0 || !nchannels || !ssize) {
 PyErr_SetFromErrno(PyExc_IOError);
 return NULL;
@@ -612,6 +670,9 @@
 audio_buf_info ai;
 int nchannels=0, ssize=0;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (_ssize(self, &nchannels, &ssize) < 0 || !nchannels || !ssize) {
 PyErr_SetFromErrno(PyExc_IOError);
 return NULL;
@@ -632,6 +693,9 @@
 audio_buf_info ai;
 int nchannels=0, ssize=0;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (_ssize(self, &nchannels, &ssize) < 0 || !nchannels || !ssize) {
 PyErr_SetFromErrno(PyExc_IOError);
 return NULL;
@@ -649,6 +713,9 @@
 count_info info;
 int req;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 if (self->mode == O_RDONLY)
 req = SNDCTL_DSP_GETIPTR;
 else
@@ -679,6 +746,9 @@
 static PyObject *
 oss_mixer_fileno(oss_mixer_t *self, PyObject *unused)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return PyLong_FromLong(self->fd);
 }
 
@@ -687,6 +757,9 @@
 static PyObject *
 oss_mixer_controls(oss_mixer_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1_internal(self->fd, args, "controls",
 SOUND_MIXER_READ_DEVMASK);
 }
@@ -694,6 +767,9 @@
 static PyObject *
 oss_mixer_stereocontrols(oss_mixer_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1_internal(self->fd, args, "stereocontrols",
 SOUND_MIXER_READ_STEREODEVS);
 }
@@ -701,6 +777,9 @@
 static PyObject *
 oss_mixer_reccontrols(oss_mixer_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1_internal(self->fd, args, "reccontrols",
 SOUND_MIXER_READ_RECMASK);
 }
@@ -710,6 +789,9 @@
 {
 int channel, volume;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 /* Can't use _do_ioctl_1 because of encoded arg thingy. */
 if (!PyArg_ParseTuple(args, "i:get", &channel))
 return NULL;
@@ -730,6 +812,9 @@
 {
 int channel, volume, leftVol, rightVol;
 
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 /* Can't use _do_ioctl_1 because of encoded arg thingy. */
 if (!PyArg_ParseTuple(args, "i(ii):set", &channel, &leftVol, &rightVol))
 return NULL;
@@ -755,6 +840,9 @@
 static PyObject *
 oss_mixer_get_recsrc(oss_mixer_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1_internal(self->fd, args, "get_recsrc",
 SOUND_MIXER_READ_RECSRC);
 }
@@ -762,6 +850,9 @@
 static PyObject *
 oss_mixer_set_recsrc(oss_mixer_t *self, PyObject *args)
 {
+ if (!_is_fd_valid(self->fd))
+ return NULL;
+
 return _do_ioctl_1(self->fd, args, "set_recsrc",
 SOUND_MIXER_WRITE_RECSRC);
 }
-- 
Repository URL: http://hg.python.org/cpython
