summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-28 21:01:59 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-28 21:01:59 (GMT)
commit75ff65ef963e7127cdb02d48cf0d1fea352a00da (patch)
tree5a6de16d28d7c1b241ae78f99a03e10b0eb0ee9c /Modules
parenteba63c4203322af73fd2a926bd20edc495717577 (diff)
downloadcpython-75ff65ef963e7127cdb02d48cf0d1fea352a00da.zip
cpython-75ff65ef963e7127cdb02d48cf0d1fea352a00da.tar.gz
cpython-75ff65ef963e7127cdb02d48cf0d1fea352a00da.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 a031d42..9ab4834 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1313,7 +1313,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) {
@@ -1382,7 +1382,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) {
@@ -1527,7 +1527,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) */