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
5f79b507
Commit
5f79b507
authored
Aug 25, 2018
by
Alexey Izbyshev
Committed by
Benjamin Peterson
Aug 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
closes bpo-34501: PyType_FromSpecWithBases: Check spec->name before dereferencing it. (GH-8930)
Reported by Svace static analyzer.
parent
44838be9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
Objects/typeobject.c
Objects/typeobject.c
+9
-4
No files found.
Objects/typeobject.c
View file @
5f79b507
...
...
@@ -2847,6 +2847,15 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
char
*
res_start
=
(
char
*
)
res
;
PyType_Slot
*
slot
;
if
(
res
==
NULL
)
return
NULL
;
if
(
spec
->
name
==
NULL
)
{
PyErr_SetString
(
PyExc_SystemError
,
"Type spec does not define the name field."
);
goto
fail
;
}
/* Set the type name and qualname */
s
=
strrchr
(
spec
->
name
,
'.'
);
if
(
s
==
NULL
)
...
...
@@ -2854,8 +2863,6 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
else
s
++
;
if
(
res
==
NULL
)
return
NULL
;
type
=
&
res
->
ht_type
;
/* The flags must be initialized early, before the GC traverses us */
type
->
tp_flags
=
spec
->
flags
|
Py_TPFLAGS_HEAPTYPE
;
...
...
@@ -2865,8 +2872,6 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
res
->
ht_qualname
=
res
->
ht_name
;
Py_INCREF
(
res
->
ht_qualname
);
type
->
tp_name
=
spec
->
name
;
if
(
!
type
->
tp_name
)
goto
fail
;
/* Adjust for empty tuple bases */
if
(
!
bases
)
{
...
...
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