Skip to content

Commit 62a1f02

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #27599: Fixed buffer overrun in binascii.b2a_qp() and binascii.a2b_qp().
2 parents 611b0fa + e6265e9 commit 62a1f02

3 files changed

Lines changed: 101 additions & 28 deletions

File tree

‎Lib/test/test_binascii.py‎

Lines changed: 92 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -192,37 +192,106 @@ def test_hex(self):
192192
self.assertEqual(binascii.unhexlify(self.type2test(t)), u)
193193

194194
def test_qp(self):
195-
binascii.a2b_qp(data=b"", header=False) # Keyword arguments allowed
195+
type2test = self.type2test
196+
a2b_qp = binascii.a2b_qp
197+
b2a_qp = binascii.b2a_qp
198+
199+
a2b_qp(data=b"", header=False) # Keyword arguments allowed
196200

197201
# A test for SF bug 534347 (segfaults without the proper fix)
198202
try:
199-
binascii.a2b_qp(b"", **{1:1})
203+
a2b_qp(b"", **{1:1})
200204
except TypeError:
201205
pass
202206
else:
203207
self.fail("binascii.a2b_qp(**{1:1}) didn't raise TypeError")
204208

205-
self.assertEqual(binascii.a2b_qp(b"= "), b"= ")
206-
self.assertEqual(binascii.a2b_qp(b"=="), b"=")
207-
self.assertEqual(binascii.a2b_qp(b"=AX"), b"=AX")
208-
self.assertRaises(TypeError, binascii.b2a_qp, foo="bar")
209-
self.assertEqual(binascii.a2b_qp(b"=00\r\n=00"), b"\x00\r\n\x00")
210-
self.assertEqual(
211-
binascii.b2a_qp(b"\xff\r\n\xff\n\xff"),
212-
b"=FF\r\n=FF\r\n=FF")
213-
self.assertEqual(
214-
binascii.b2a_qp(b"0"*75+b"\xff\r\n\xff\r\n\xff"),
215-
b"0"*75+b"=\r\n=FF\r\n=FF\r\n=FF")
216-
217-
self.assertEqual(binascii.b2a_qp(b'\0\n'), b'=00\n')
218-
self.assertEqual(binascii.b2a_qp(b'\0\n', quotetabs=True), b'=00\n')
219-
self.assertEqual(binascii.b2a_qp(b'foo\tbar\t\n'), b'foo\tbar=09\n')
220-
self.assertEqual(binascii.b2a_qp(b'foo\tbar\t\n', quotetabs=True),
221-
b'foo=09bar=09\n')
222-
223-
self.assertEqual(binascii.b2a_qp(b'.'), b'=2E')
224-
self.assertEqual(binascii.b2a_qp(b'.\n'), b'=2E\n')
225-
self.assertEqual(binascii.b2a_qp(b'a.\n'), b'a.\n')
209+
self.assertEqual(a2b_qp(type2test(b"=")), b"")
210+
self.assertEqual(a2b_qp(type2test(b"= ")), b"= ")
211+
self.assertEqual(a2b_qp(type2test(b"==")), b"=")
212+
self.assertEqual(a2b_qp(type2test(b"=\nAB")), b"AB")
213+
self.assertEqual(a2b_qp(type2test(b"=\r\nAB")), b"AB")
214+
self.assertEqual(a2b_qp(type2test(b"=\rAB")), b"") # ?
215+
self.assertEqual(a2b_qp(type2test(b"=\rAB\nCD")), b"CD") # ?
216+
self.assertEqual(a2b_qp(type2test(b"=AB")), b"\xab")
217+
self.assertEqual(a2b_qp(type2test(b"=ab")), b"\xab")
218+
self.assertEqual(a2b_qp(type2test(b"=AX")), b"=AX")
219+
self.assertEqual(a2b_qp(type2test(b"=XA")), b"=XA")
220+
self.assertEqual(a2b_qp(type2test(b"=AB")[:-1]), b"=A")
221+
222+
self.assertEqual(a2b_qp(type2test(b'_')), b'_')
223+
self.assertEqual(a2b_qp(type2test(b'_'), header=True), b' ')
224+
225+
self.assertRaises(TypeError, b2a_qp, foo="bar")
226+
self.assertEqual(a2b_qp(type2test(b"=00\r\n=00")), b"\x00\r\n\x00")
227+
self.assertEqual(b2a_qp(type2test(b"\xff\r\n\xff\n\xff")),
228+
b"=FF\r\n=FF\r\n=FF")
229+
self.assertEqual(b2a_qp(type2test(b"0"*75+b"\xff\r\n\xff\r\n\xff")),
230+
b"0"*75+b"=\r\n=FF\r\n=FF\r\n=FF")
231+
232+
self.assertEqual(b2a_qp(type2test(b'\x7f')), b'=7F')
233+
self.assertEqual(b2a_qp(type2test(b'=')), b'=3D')
234+
235+
self.assertEqual(b2a_qp(type2test(b'_')), b'_')
236+
self.assertEqual(b2a_qp(type2test(b'_'), header=True), b'=5F')
237+
self.assertEqual(b2a_qp(type2test(b'x y'), header=True), b'x_y')
238+
self.assertEqual(b2a_qp(type2test(b'x '), header=True), b'x=20')
239+
self.assertEqual(b2a_qp(type2test(b'x y'), header=True, quotetabs=True),
240+
b'x=20y')
241+
self.assertEqual(b2a_qp(type2test(b'x\ty'), header=True), b'x\ty')
242+
243+
self.assertEqual(b2a_qp(type2test(b' ')), b'=20')
244+
self.assertEqual(b2a_qp(type2test(b'\t')), b'=09')
245+
self.assertEqual(b2a_qp(type2test(b' x')), b' x')
246+
self.assertEqual(b2a_qp(type2test(b'\tx')), b'\tx')
247+
self.assertEqual(b2a_qp(type2test(b' x')[:-1]), b'=20')
248+
self.assertEqual(b2a_qp(type2test(b'\tx')[:-1]), b'=09')
249+
self.assertEqual(b2a_qp(type2test(b'\0')), b'=00')
250+
251+
self.assertEqual(b2a_qp(type2test(b'\0\n')), b'=00\n')
252+
self.assertEqual(b2a_qp(type2test(b'\0\n'), quotetabs=True), b'=00\n')
253+
254+
self.assertEqual(b2a_qp(type2test(b'x y\tz')), b'x y\tz')
255+
self.assertEqual(b2a_qp(type2test(b'x y\tz'), quotetabs=True),
256+
b'x=20y=09z')
257+
self.assertEqual(b2a_qp(type2test(b'x y\tz'), istext=False),
258+
b'x y\tz')
259+
self.assertEqual(b2a_qp(type2test(b'x \ny\t\n')),
260+
b'x=20\ny=09\n')
261+
self.assertEqual(b2a_qp(type2test(b'x \ny\t\n'), quotetabs=True),
262+
b'x=20\ny=09\n')
263+
self.assertEqual(b2a_qp(type2test(b'x \ny\t\n'), istext=False),
264+
b'x =0Ay\t=0A')
265+
self.assertEqual(b2a_qp(type2test(b'x \ry\t\r')),
266+
b'x \ry\t\r')
267+
self.assertEqual(b2a_qp(type2test(b'x \ry\t\r'), quotetabs=True),
268+
b'x=20\ry=09\r')
269+
self.assertEqual(b2a_qp(type2test(b'x \ry\t\r'), istext=False),
270+
b'x =0Dy\t=0D')
271+
self.assertEqual(b2a_qp(type2test(b'x \r\ny\t\r\n')),
272+
b'x=20\r\ny=09\r\n')
273+
self.assertEqual(b2a_qp(type2test(b'x \r\ny\t\r\n'), quotetabs=True),
274+
b'x=20\r\ny=09\r\n')
275+
self.assertEqual(b2a_qp(type2test(b'x \r\ny\t\r\n'), istext=False),
276+
b'x =0D=0Ay\t=0D=0A')
277+
278+
self.assertEqual(b2a_qp(type2test(b'x \r\n')[:-1]), b'x \r')
279+
self.assertEqual(b2a_qp(type2test(b'x\t\r\n')[:-1]), b'x\t\r')
280+
self.assertEqual(b2a_qp(type2test(b'x \r\n')[:-1], quotetabs=True),
281+
b'x=20\r')
282+
self.assertEqual(b2a_qp(type2test(b'x\t\r\n')[:-1], quotetabs=True),
283+
b'x=09\r')
284+
self.assertEqual(b2a_qp(type2test(b'x \r\n')[:-1], istext=False),
285+
b'x =0D')
286+
self.assertEqual(b2a_qp(type2test(b'x\t\r\n')[:-1], istext=False),
287+
b'x\t=0D')
288+
289+
self.assertEqual(b2a_qp(type2test(b'.')), b'=2E')
290+
self.assertEqual(b2a_qp(type2test(b'.\n')), b'=2E\n')
291+
self.assertEqual(b2a_qp(type2test(b'.\r')), b'=2E\r')
292+
self.assertEqual(b2a_qp(type2test(b'.\0')), b'=2E=00')
293+
self.assertEqual(b2a_qp(type2test(b'a.\n')), b'a.\n')
294+
self.assertEqual(b2a_qp(type2test(b'.a')[:-1]), b'=2E')
226295

227296
def test_empty_string(self):
228297
# A test for SF bug #1022953. Make sure SystemError is not raised.

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Core and Builtins
2222
Library
2323
-------
2424

25+
- Issue #27599: Fixed buffer overrun in binascii.b2a_qp() and binascii.a2b_qp().
26+
2527
Build
2628
-----
2729

‎Modules/binascii.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,8 @@ binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header)
12761276
odata[out++] = '=';
12771277
in++;
12781278
}
1279-
else if (((ascii_data[in] >= 'A' && ascii_data[in] <= 'F') ||
1279+
else if ((in + 1 < datalen) &&
1280+
((ascii_data[in] >= 'A' && ascii_data[in] <= 'F') ||
12801281
(ascii_data[in] >= 'a' && ascii_data[in] <= 'f') ||
12811282
(ascii_data[in] >= '0' && ascii_data[in] <= '9')) &&
12821283
((ascii_data[in+1] >= 'A' && ascii_data[in+1] <= 'F') ||
@@ -1375,7 +1376,8 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs,
13751376
(databuf[in] == '=') ||
13761377
(header && databuf[in] == '_') ||
13771378
((databuf[in] == '.') && (linelen == 0) &&
1378-
(databuf[in+1] == '\n' || databuf[in+1] == '\r' || databuf[in+1] == 0)) ||
1379+
(in + 1 == datalen || databuf[in+1] == '\n' ||
1380+
databuf[in+1] == '\r' || databuf[in+1] == 0)) ||
13791381
(!istext && ((databuf[in] == '\r') || (databuf[in] == '\n'))) ||
13801382
((databuf[in] == '\t' || databuf[in] == ' ') && (in + 1 == datalen)) ||
13811383
((databuf[in] < 33) &&
@@ -1451,13 +1453,13 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs,
14511453
(databuf[in] == '=') ||
14521454
(header && databuf[in] == '_') ||
14531455
((databuf[in] == '.') && (linelen == 0) &&
1454-
(databuf[in+1] == '\n' || databuf[in+1] == '\r' || databuf[in+1] == 0)) ||
1456+
(in + 1 == datalen || databuf[in+1] == '\n' ||
1457+
databuf[in+1] == '\r' || databuf[in+1] == 0)) ||
14551458
(!istext && ((databuf[in] == '\r') || (databuf[in] == '\n'))) ||
14561459
((databuf[in] == '\t' || databuf[in] == ' ') && (in + 1 == datalen)) ||
14571460
((databuf[in] < 33) &&
14581461
(databuf[in] != '\r') && (databuf[in] != '\n') &&
1459-
(quotetabs ||
1460-
(!quotetabs && ((databuf[in] != '\t') && (databuf[in] != ' '))))))
1462+
(quotetabs || ((databuf[in] != '\t') && (databuf[in] != ' ')))))
14611463
{
14621464
if ((linelen + 3 )>= MAXLINESIZE) {
14631465
odata[out++] = '=';

0 commit comments

Comments
 (0)