summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-28 21:02:47 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-28 21:02:47 (GMT)
commit04d9dd06aab9be7da27528c124602482cb8a99a2 (patch)
treecd94abbad9fddb6c77583c0281f61542f1a157a1 /Modules
parentce816a51112afb28d1a7ea7e2e10af749be9ff28 (diff)
parent75ff65ef963e7127cdb02d48cf0d1fea352a00da (diff)
downloadcpython-04d9dd06aab9be7da27528c124602482cb8a99a2.zip
cpython-04d9dd06aab9be7da27528c124602482cb8a99a2.tar.gz
cpython-04d9dd06aab9be7da27528c124602482cb8a99a2.tar.bz2
Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data.
Patch by Oleg Plakhotnyuk.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/audioop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/audioop.c b/Modules/audioop.c
index daf70dc..0375e4e 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1311,7 +1311,7 @@ audioop_ulaw2lin(PyObject *self, PyObject *args)
&cp, &len, &size) )
return 0;
- if (!audioop_check_parameters(len, size))
+ if (!audioop_check_size(size))
return NULL;
if (len > PY_SSIZE_T_MAX/size) {
@@ -1380,7 +1380,7 @@ audioop_alaw2lin(PyObject *self, PyObject *args)
&cp, &len, &size) )
return 0;
- if (!audioop_check_parameters(len, size))
+ if (!audioop_check_size(size))
return NULL;
if (len > PY_SSIZE_T_MAX/size) {
@@ -1524,7 +1524,7 @@ audioop_adpcm2lin(PyObject *self, PyObject *args)
&cp, &len, &size, &state) )
return 0;
- if (!audioop_check_parameters(len, size))
+ if (!audioop_check_size(size))
return NULL;
/* Decode state, should have (value, step) */