Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d4250a42
Commit
d4250a42
authored
Aug 13, 2016
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix possible integer overflow in binascii.b2a_qp (closes #27760)
Reported by Thomas E. Hybel
parent
21088620
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
Misc/NEWS
Misc/NEWS
+2
-0
Modules/binascii.c
Modules/binascii.c
+16
-9
No files found.
Misc/NEWS
View file @
d4250a42
...
...
@@ -29,6 +29,8 @@ Core and Builtins
Library
-------
- Issue #27760: Fix possible integer overflow in binascii.b2a_qp.
- Issue #27758: Fix possible integer overflow in the _csv module for large record
lengths.
...
...
Modules/binascii.c
View file @
d4250a42
...
...
@@ -1365,6 +1365,7 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
/* First, scan to see how many characters need to be encoded */
in
=
0
;
while
(
in
<
datalen
)
{
Py_ssize_t
delta
=
0
;
if
((
data
[
in
]
>
126
)
||
(
data
[
in
]
==
'='
)
||
(
header
&&
data
[
in
]
==
'_'
)
||
...
...
@@ -1379,12 +1380,12 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
if
((
linelen
+
3
)
>=
MAXLINESIZE
)
{
linelen
=
0
;
if
(
crlf
)
odatalen
+=
3
;
delta
+=
3
;
else
odatalen
+=
2
;
delta
+=
2
;
}
linelen
+=
3
;
odatalen
+=
3
;
delta
+=
3
;
in
++
;
}
else
{
...
...
@@ -1396,11 +1397,11 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
linelen
=
0
;
/* Protect against whitespace on end of line */
if
(
in
&&
((
data
[
in
-
1
]
==
' '
)
||
(
data
[
in
-
1
]
==
'\t'
)))
odatalen
+=
2
;
delta
+=
2
;
if
(
crlf
)
odatalen
+=
2
;
delta
+=
2
;
else
odatalen
+=
1
;
delta
+=
1
;
if
(
data
[
in
]
==
'\r'
)
in
+=
2
;
else
...
...
@@ -1412,15 +1413,21 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
(
linelen
+
1
)
>=
MAXLINESIZE
)
{
linelen
=
0
;
if
(
crlf
)
odatalen
+=
3
;
delta
+=
3
;
else
odatalen
+=
2
;
delta
+=
2
;
}
linelen
++
;
odatalen
++
;
delta
++
;
in
++
;
}
}
if
(
PY_SSIZE_T_MAX
-
delta
<
odatalen
)
{
PyBuffer_Release
(
&
pdata
);
PyErr_NoMemory
();
return
NULL
;
}
odatalen
+=
delta
;
}
/* We allocate the output same size as input, this is overkill.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment