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
20a003be
Commit
20a003be
authored
Dec 24, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #24103: Fixed possible use after free in ElementTree.iterparse().
parent
5951f230
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
13 deletions
+9
-13
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_elementtree.c
Modules/_elementtree.c
+7
-13
No files found.
Misc/NEWS
View file @
20a003be
...
...
@@ -29,6 +29,8 @@ Core and Builtins
Library
-------
- Issue #24103: Fixed possible use after free in ElementTree.iterparse().
- Issue #20954: _args_from_interpreter_flags used by multiprocessing and some
tests no longer behaves incorrectly in the presence of the PYTHONHASHSEED
environment variable.
...
...
Modules/_elementtree.c
View file @
20a003be
...
...
@@ -2751,8 +2751,7 @@ xmlparser_setevents(XMLParserObject* self, PyObject* args)
target
=
(
TreeBuilderObject
*
)
self
->
target
;
Py_INCREF
(
events
);
Py_XDECREF
(
target
->
events
);
target
->
events
=
events
;
Py_SETREF
(
target
->
events
,
events
);
/* clear out existing events */
Py_CLEAR
(
target
->
start_event_obj
);
...
...
@@ -2774,33 +2773,28 @@ xmlparser_setevents(XMLParserObject* self, PyObject* args)
char
*
event
;
if
(
!
PyString_Check
(
item
))
goto
error
;
Py_INCREF
(
item
);
event
=
PyString_AS_STRING
(
item
);
if
(
strcmp
(
event
,
"start"
)
==
0
)
{
Py_INCREF
(
item
);
target
->
start_event_obj
=
item
;
Py_SETREF
(
target
->
start_event_obj
,
item
);
}
else
if
(
strcmp
(
event
,
"end"
)
==
0
)
{
Py_INCREF
(
item
);
Py_XDECREF
(
target
->
end_event_obj
);
target
->
end_event_obj
=
item
;
Py_SETREF
(
target
->
end_event_obj
,
item
);
}
else
if
(
strcmp
(
event
,
"start-ns"
)
==
0
)
{
Py_INCREF
(
item
);
Py_XDECREF
(
target
->
start_ns_event_obj
);
target
->
start_ns_event_obj
=
item
;
Py_SETREF
(
target
->
start_ns_event_obj
,
item
);
EXPAT
(
SetNamespaceDeclHandler
)(
self
->
parser
,
(
XML_StartNamespaceDeclHandler
)
expat_start_ns_handler
,
(
XML_EndNamespaceDeclHandler
)
expat_end_ns_handler
);
}
else
if
(
strcmp
(
event
,
"end-ns"
)
==
0
)
{
Py_INCREF
(
item
);
Py_XDECREF
(
target
->
end_ns_event_obj
);
target
->
end_ns_event_obj
=
item
;
Py_SETREF
(
target
->
end_ns_event_obj
,
item
);
EXPAT
(
SetNamespaceDeclHandler
)(
self
->
parser
,
(
XML_StartNamespaceDeclHandler
)
expat_start_ns_handler
,
(
XML_EndNamespaceDeclHandler
)
expat_end_ns_handler
);
}
else
{
Py_DECREF
(
item
);
PyErr_Format
(
PyExc_ValueError
,
"unknown event '%s'"
,
event
...
...
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