traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

audioop: adpcm2lin() and lin2adpcm() now raises a TypeError instead of a 

SystemError if the state type is invalid.
This commit is contained in:
Victor Stinner 2014-01-03 03:26:47 +01:00
parent 6f055e73df
commit daeffd2c08
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_audioop.py
View File

@ -269,6 +269,11 @@ class TestAudioop(unittest.TestCase):
self.assertEqual(audioop.lin2adpcm(b'\0' * w * 10, w, None),
(b'\0' * 5, (0, 0)))
def test_invalid_adpcm_state(self):
# state must be a tuple or None, not an integer
self.assertRaises(TypeError, audioop.adpcm2lin, b'\0', 1, 555)
self.assertRaises(TypeError, audioop.lin2adpcm, b'\0', 1, 555)
def test_lin2alaw(self):
self.assertEqual(audioop.lin2alaw(datas[1], 1),
b'\xd5\x87\xa4\x24\xaa\x2a\x5a')

6
Modules/audioop.c
View File

@ -1525,6 +1525,9 @@ audioop_lin2adpcm(PyObject *self, PyObject *args)
/* First time, it seems. Set defaults */
valpred = 0;
index = 0;
} else if (!PyTuple_Check(state)) {
PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
goto exit;
} else if (!PyArg_ParseTuple(state, "ii", &valpred, &index))
goto exit;
@ -1631,6 +1634,9 @@ audioop_adpcm2lin(PyObject *self, PyObject *args)
/* First time, it seems. Set defaults */
valpred = 0;
index = 0;
} else if (!PyTuple_Check(state)) {
PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
goto exit;
} else if (!PyArg_ParseTuple(state, "ii", &valpred, &index))
goto exit;