Mailman 3 January 2012 - Python-checkins

cpython (3.2): Issue #13806: The size check in audioop decompression functions was too strict
by antoine.pitrou Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/77188bc37c74 changeset: 74670:77188bc37c74 branch: 3.2 parent: 74668:10c79f29e417 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Jan 28 22:01:59 2012 +0100 summary: Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. files: Lib/test/test_audioop.py | 25 +++++++++++++++++++------ Misc/NEWS | 3 +++ Modules/audioop.c | 6 +++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -21,9 +21,9 @@ data = [gendata1(), gendata2(), gendata4()] INVALID_DATA = [ - ('abc', 0), - ('abc', 2), - ('abc', 4), + (b'abc', 0), + (b'abc', 2), + (b'abc', 4), ] @@ -94,7 +94,9 @@ def test_adpcm2lin(self): # Very cursory test - self.assertEqual(audioop.adpcm2lin(b'\0\0', 1, None), (b'\0\0\0\0', (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 1, None), (b'\0' * 4, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 2, None), (b'\0' * 8, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 4, None), (b'\0' * 16, (0,0))) def test_lin2adpcm(self): # Very cursory test @@ -109,6 +111,9 @@ # Cursory d = audioop.lin2alaw(data[0], 1) self.assertEqual(audioop.alaw2lin(d, 1), data[0]) + self.assertEqual(audioop.alaw2lin(d, 2), b'\x08\x00\x08\x01\x10\x02') + self.assertEqual(audioop.alaw2lin(d, 4), + b'\x00\x00\x08\x00\x00\x00\x08\x01\x00\x00\x10\x02') def test_lin2ulaw(self): self.assertEqual(audioop.lin2ulaw(data[0], 1), b'\xff\xe7\xdb') @@ -119,6 +124,9 @@ # Cursory d = audioop.lin2ulaw(data[0], 1) self.assertEqual(audioop.ulaw2lin(d, 1), data[0]) + self.assertEqual(audioop.ulaw2lin(d, 2), b'\x00\x00\x04\x01\x0c\x02') + self.assertEqual(audioop.ulaw2lin(d, 4), + b'\x00\x00\x00\x00\x00\x00\x04\x01\x00\x00\x0c\x02') def test_mul(self): data2 = [] @@ -195,10 +203,15 @@ self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2) self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state) self.assertRaises(audioop.error, audioop.lin2ulaw, data, size) + self.assertRaises(audioop.error, audioop.lin2alaw, data, size) + self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) + + def test_wrongsize(self): + data = b'abc' + state = None + for size in (-1, 3, 5): self.assertRaises(audioop.error, audioop.ulaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2alaw, data, size) self.assertRaises(audioop.error, audioop.alaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state) def test_main(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -111,6 +111,9 @@ Library ------- +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + - Issue #13812: When a multiprocessing Process child raises an exception, flush stderr after printing the exception traceback. diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1313,7 +1313,7 @@ &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 @@ &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 @@ &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) */ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13806: The size check in audioop decompression functions was too strict
by antoine.pitrou Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/ce89dcba008f changeset: 74671:ce89dcba008f parent: 74669:db0c717cbc01 parent: 74670:77188bc37c74 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Jan 28 22:02:47 2012 +0100 summary: Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. files: Lib/test/test_audioop.py | 25 +++++++++++++++++++------ Misc/NEWS | 3 +++ Modules/audioop.c | 6 +++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -21,9 +21,9 @@ data = [gendata1(), gendata2(), gendata4()] INVALID_DATA = [ - ('abc', 0), - ('abc', 2), - ('abc', 4), + (b'abc', 0), + (b'abc', 2), + (b'abc', 4), ] @@ -94,7 +94,9 @@ def test_adpcm2lin(self): # Very cursory test - self.assertEqual(audioop.adpcm2lin(b'\0\0', 1, None), (b'\0\0\0\0', (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 1, None), (b'\0' * 4, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 2, None), (b'\0' * 8, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 4, None), (b'\0' * 16, (0,0))) def test_lin2adpcm(self): # Very cursory test @@ -109,6 +111,9 @@ # Cursory d = audioop.lin2alaw(data[0], 1) self.assertEqual(audioop.alaw2lin(d, 1), data[0]) + self.assertEqual(audioop.alaw2lin(d, 2), b'\x08\x00\x08\x01\x10\x02') + self.assertEqual(audioop.alaw2lin(d, 4), + b'\x00\x00\x08\x00\x00\x00\x08\x01\x00\x00\x10\x02') def test_lin2ulaw(self): self.assertEqual(audioop.lin2ulaw(data[0], 1), b'\xff\xe7\xdb') @@ -119,6 +124,9 @@ # Cursory d = audioop.lin2ulaw(data[0], 1) self.assertEqual(audioop.ulaw2lin(d, 1), data[0]) + self.assertEqual(audioop.ulaw2lin(d, 2), b'\x00\x00\x04\x01\x0c\x02') + self.assertEqual(audioop.ulaw2lin(d, 4), + b'\x00\x00\x00\x00\x00\x00\x04\x01\x00\x00\x0c\x02') def test_mul(self): data2 = [] @@ -195,10 +203,15 @@ self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2) self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state) self.assertRaises(audioop.error, audioop.lin2ulaw, data, size) + self.assertRaises(audioop.error, audioop.lin2alaw, data, size) + self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) + + def test_wrongsize(self): + data = b'abc' + state = None + for size in (-1, 3, 5): self.assertRaises(audioop.error, audioop.ulaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2alaw, data, size) self.assertRaises(audioop.error, audioop.alaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state) def test_main(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -461,6 +461,9 @@ Library ------- +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + - Issue #13812: When a multiprocessing Process child raises an exception, flush stderr after printing the exception traceback. diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1311,7 +1311,7 @@ &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 @@ &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 @@ &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) */ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13895: fix test_ssl hanging under Ubuntu
by antoine.pitrou Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/db0c717cbc01 changeset: 74669:db0c717cbc01 parent: 74667:86452e102929 parent: 74668:10c79f29e417 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Jan 28 17:40:23 2012 +0100 summary: Issue #13895: fix test_ssl hanging under Ubuntu files: Lib/test/test_ssl.py | 50 ++++++++++++++++---------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1198,33 +1198,33 @@ chatty=chatty, connectionchatty=False) with server: - s = client_context.wrap_socket(socket.socket()) - s.connect((HOST, server.port)) - for arg in [indata, bytearray(indata), memoryview(indata)]: + with client_context.wrap_socket(socket.socket()) as s: + s.connect((HOST, server.port)) + for arg in [indata, bytearray(indata), memoryview(indata)]: + if connectionchatty: + if support.verbose: + sys.stdout.write( + " client: sending %r...\n" % indata) + s.write(arg) + outdata = s.read() + if connectionchatty: + if support.verbose: + sys.stdout.write(" client: read %r\n" % outdata) + if outdata != indata.lower(): + raise AssertionError( + "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" + % (outdata[:20], len(outdata), + indata[:20].lower(), len(indata))) + s.write(b"over\n") if connectionchatty: if support.verbose: - sys.stdout.write( - " client: sending %r...\n" % indata) - s.write(arg) - outdata = s.read() - if connectionchatty: - if support.verbose: - sys.stdout.write(" client: read %r\n" % outdata) - if outdata != indata.lower(): - raise AssertionError( - "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" - % (outdata[:20], len(outdata), - indata[:20].lower(), len(indata))) - s.write(b"over\n") - if connectionchatty: - if support.verbose: - sys.stdout.write(" client: closing connection.\n") - stats = { - 'compression': s.compression(), - 'cipher': s.cipher(), - } - s.close() - return stats + sys.stdout.write(" client: closing connection.\n") + stats = { + 'compression': s.compression(), + 'cipher': s.cipher(), + } + s.close() + return stats def try_protocol_combo(server_protocol, client_protocol, expect_success, certsreqs=None, server_options=0, client_options=0): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13895: fix test_ssl hanging under Ubuntu
by antoine.pitrou Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/10c79f29e417 changeset: 74668:10c79f29e417 branch: 3.2 parent: 74665:5cf181df7bea user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Jan 28 17:38:34 2012 +0100 summary: Issue #13895: fix test_ssl hanging under Ubuntu files: Lib/test/test_ssl.py | 40 ++++++++++++++++---------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1078,28 +1078,28 @@ chatty=chatty, connectionchatty=False) with server: - s = client_context.wrap_socket(socket.socket()) - s.connect((HOST, server.port)) - for arg in [indata, bytearray(indata), memoryview(indata)]: + with client_context.wrap_socket(socket.socket()) as s: + s.connect((HOST, server.port)) + for arg in [indata, bytearray(indata), memoryview(indata)]: + if connectionchatty: + if support.verbose: + sys.stdout.write( + " client: sending %r...\n" % indata) + s.write(arg) + outdata = s.read() + if connectionchatty: + if support.verbose: + sys.stdout.write(" client: read %r\n" % outdata) + if outdata != indata.lower(): + raise AssertionError( + "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" + % (outdata[:20], len(outdata), + indata[:20].lower(), len(indata))) + s.write(b"over\n") if connectionchatty: if support.verbose: - sys.stdout.write( - " client: sending %r...\n" % indata) - s.write(arg) - outdata = s.read() - if connectionchatty: - if support.verbose: - sys.stdout.write(" client: read %r\n" % outdata) - if outdata != indata.lower(): - raise AssertionError( - "bad data <<%r>> (%d) received; expected <<%r>> (%d)\n" - % (outdata[:20], len(outdata), - indata[:20].lower(), len(indata))) - s.write(b"over\n") - if connectionchatty: - if support.verbose: - sys.stdout.write(" client: closing connection.\n") - s.close() + sys.stdout.write(" client: closing connection.\n") + s.close() def try_protocol_combo(server_protocol, client_protocol, expect_success, certsreqs=None, server_options=0, client_options=0): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix typo in comment.
by nadeem.vawda Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/86452e102929 changeset: 74667:86452e102929 user: Nadeem Vawda <nadeem.vawda(a)gmail.com> date: Sat Jan 28 17:32:47 2012 +0200 summary: Fix typo in comment. files: Lib/test/test_zlib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -20,7 +20,7 @@ # major version that we were compiled against. We can't guarantee that # the minor versions will match (even on the machine on which the module # was compiled), and the API is stable between minor versions, so - # testing only the major verions avoids spurious failures. + # testing only the major versions avoids spurious failures. self.assertEqual(zlib.ZLIB_RUNTIME_VERSION[0], zlib.ZLIB_VERSION[0]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
by charles-francois.natali Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/279b6d778663 changeset: 74666:279b6d778663 parent: 74663:265d35e8fe82 parent: 74665:5cf181df7bea user: Charles-François Natali <neologix(a)free.fr> date: Sat Jan 28 11:37:42 2012 +0100 summary: Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch by Matt Joiner. files: Lib/test/test_threading.py | 1 + Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -738,6 +738,7 @@ class PyRLockTests(lock_tests.RLockTests): locktype = staticmethod(threading._PyRLock) +(a)unittest.skipIf(threading._CRLock is None, 'RLock not implemented in C') class CRLockTests(lock_tests.RLockTests): locktype = staticmethod(threading._CRLock) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -492,6 +492,7 @@ Fredrik Johansson Gregory K. Johnson Simon Johnston +Matt Joiner Thomas Jollans Nicolas Joly Evan Jones -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
by charles-francois.natali Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/5cf181df7bea changeset: 74665:5cf181df7bea branch: 3.2 parent: 74662:5b8800004955 user: Charles-François Natali <neologix(a)free.fr> date: Sat Jan 28 11:36:04 2012 +0100 summary: Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch by Matt Joiner. files: Lib/test/test_threading.py | 1 + Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -726,6 +726,7 @@ class PyRLockTests(lock_tests.RLockTests): locktype = staticmethod(threading._PyRLock) +(a)unittest.skipIf(threading._CRLock is None, 'RLock not implemented in C') class CRLockTests(lock_tests.RLockTests): locktype = staticmethod(threading._CRLock) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -453,6 +453,7 @@ Fredrik Johansson Gregory K. Johnson Simon Johnston +Matt Joiner Thomas Jollans Nicolas Joly Evan Jones -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (265d35e8fe82): sum=0
by solipsis＠pitrou.net Jan. 28, 2012

Jan. 28, 2012

results for 265d35e8fe82 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogCOoNy4', '-x']

1 0

cpython (2.7): Issue #13889: Add missing _Py_SET_53BIT_PRECISION_* calls around uses of dtoa.c
by mark.dickinson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/eaf553b063a7 changeset: 74664:eaf553b063a7 branch: 2.7 parent: 74661:f2360aafc450 user: Mark Dickinson <mdickinson(a)enthought.com> date: Fri Jan 27 21:16:01 2012 +0000 summary: Issue #13889: Add missing _Py_SET_53BIT_PRECISION_* calls around uses of dtoa.c functions in float round. files: Objects/floatobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Objects/floatobject.c b/Objects/floatobject.c --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1086,6 +1086,7 @@ char *buf, *buf_end, shortbuf[100], *mybuf=shortbuf; int decpt, sign, val, halfway_case; PyObject *result = NULL; + _Py_SET_53BIT_PRECISION_HEADER; /* The basic idea is very simple: convert and round the double to a decimal string using _Py_dg_dtoa, then convert that decimal string @@ -1142,7 +1143,9 @@ halfway_case = 0; /* round to a decimal string; use an extra place for halfway case */ + _Py_SET_53BIT_PRECISION_START; buf = _Py_dg_dtoa(x, 3, ndigits+halfway_case, &decpt, &sign, &buf_end); + _Py_SET_53BIT_PRECISION_END; if (buf == NULL) { PyErr_NoMemory(); return NULL; @@ -1186,7 +1189,9 @@ /* and convert the resulting string back to a double */ errno = 0; + _Py_SET_53BIT_PRECISION_START; rounded = _Py_dg_strtod(mybuf, NULL); + _Py_SET_53BIT_PRECISION_END; if (errno == ERANGE && fabs(rounded) >= 1.) PyErr_SetString(PyExc_OverflowError, "rounded value too large to represent"); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge 3.2 -> default (issue 13889)
by mark.dickinson Jan. 27, 2012

Jan. 27, 2012

http://hg.python.org/cpython/rev/265d35e8fe82 changeset: 74663:265d35e8fe82 parent: 74660:b99c54acb22d parent: 74662:5b8800004955 user: Mark Dickinson <mdickinson(a)enthought.com> date: Fri Jan 27 21:17:04 2012 +0000 summary: Merge 3.2 -> default (issue 13889) files: Objects/floatobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Objects/floatobject.c b/Objects/floatobject.c --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -902,9 +902,12 @@ char *buf, *buf_end, shortbuf[100], *mybuf=shortbuf; int decpt, sign; PyObject *result = NULL; + _Py_SET_53BIT_PRECISION_HEADER; /* round to a decimal string */ + _Py_SET_53BIT_PRECISION_START; buf = _Py_dg_dtoa(x, 3, ndigits, &decpt, &sign, &buf_end); + _Py_SET_53BIT_PRECISION_END; if (buf == NULL) { PyErr_NoMemory(); return NULL; @@ -927,7 +930,9 @@ /* and convert the resulting string back to a double */ errno = 0; + _Py_SET_53BIT_PRECISION_START; rounded = _Py_dg_strtod(mybuf, NULL); + _Py_SET_53BIT_PRECISION_END; if (errno == ERANGE && fabs(rounded) >= 1.) PyErr_SetString(PyExc_OverflowError, "rounded value too large to represent"); -- Repository URL: http://hg.python.org/cpython

1 0