From 48d761e2b4b8cef40349aa286f6f46fc6c6d0fa7 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 17 Dec 2013 15:11:24 +0200 Subject: Issue #16404: Add checks for return value of PyLong_FromLong() in sys.getwindowsversion() and ossaudiodev.setparameters(). Reported by Ned Batchelder. --- Modules/ossaudiodev.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Modules/ossaudiodev.c') diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 50e266f087..817e20428c 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -561,7 +561,6 @@ oss_setparameters(oss_audio_t *self, PyObject *args) { int wanted_fmt, wanted_channels, wanted_rate, strict=0; int fmt, channels, rate; - PyObject * rv; /* return tuple (fmt, channels, rate) */ if (!_is_fd_valid(self->fd)) return NULL; @@ -606,13 +605,7 @@ oss_setparameters(oss_audio_t *self, PyObject *args) /* Construct the return value: a (fmt, channels, rate) tuple that tells what the audio hardware was actually set to. */ - rv = PyTuple_New(3); - if (rv == NULL) - return NULL; - PyTuple_SET_ITEM(rv, 0, PyLong_FromLong(fmt)); - PyTuple_SET_ITEM(rv, 1, PyLong_FromLong(channels)); - PyTuple_SET_ITEM(rv, 2, PyLong_FromLong(rate)); - return rv; + return Py_BuildValue("(iii)", fmt, channels, rate); } static int -- cgit v1.2.1