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
4a699f62
Commit
4a699f62
authored
Nov 18, 2008
by
Amaury Forgeot d'Arc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#4317: Fix an Array Bounds Read in imageop.rgb2rgb8.
Backport of r67266
parent
af2325be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
Lib/test/test_imageop.py
Lib/test/test_imageop.py
+2
-1
Misc/NEWS
Misc/NEWS
+2
-0
Modules/imageop.c
Modules/imageop.c
+1
-1
No files found.
Lib/test/test_imageop.py
View file @
4a699f62
...
...
@@ -19,6 +19,7 @@ SIZES = (1, 2, 3, 4)
_VALUES
=
(
1
,
2
,
2
**
10
,
2
**
15
-
1
,
2
**
15
,
2
**
15
+
1
,
2
**
31
-
2
,
2
**
31
-
1
)
VALUES
=
tuple
(
-
x
for
x
in
reversed
(
_VALUES
)
)
+
(
0
,)
+
_VALUES
AAAAA
=
"A"
*
1024
MAX_LEN
=
2
**
20
class
InputValidationTests
(
unittest
.
TestCase
):
...
...
@@ -30,7 +31,7 @@ class InputValidationTests(unittest.TestCase):
strlen
=
abs
(
width
*
height
)
if
size
:
strlen
*=
size
if
strlen
<
1024
:
if
strlen
<
MAX_LEN
:
data
=
"A"
*
strlen
else
:
data
=
AAAAA
...
...
Misc/NEWS
View file @
4a699f62
...
...
@@ -12,6 +12,8 @@ What's New in Python 2.5.3?
Core and builtins
-----------------
- Issue #4317: Fixed a crash in the imageop.rgb2rgb8() function.
- Issue #4230: If ``__getattr__`` is a descriptor, it now functions correctly.
- Issue #4048: The parser module now correctly validates relative imports.
...
...
Modules/imageop.c
View file @
4a699f62
...
...
@@ -590,7 +590,7 @@ imageop_rgb2rgb8(PyObject *self, PyObject *args)
if
(
!
PyArg_ParseTuple
(
args
,
"s#ii"
,
&
cp
,
&
len
,
&
x
,
&
y
)
)
return
0
;
if
(
!
check_multiply_size
(
len
*
4
,
x
,
"x"
,
y
,
"y"
,
4
)
)
if
(
!
check_multiply_size
(
len
,
x
,
"x"
,
y
,
"y"
,
4
)
)
return
0
;
nlen
=
x
*
y
;
if
(
!
check_multiply
(
nlen
,
x
,
y
)
)
...
...
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