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
64234293
Commit
64234293
authored
Aug 16, 2016
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge 3.4 (#27783)
parents
379a3ffa
a12d92be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_operator.c
Modules/_operator.c
+8
-8
No files found.
Misc/NEWS
View file @
64234293
...
...
@@ -42,6 +42,8 @@ Library
-
In
the
curses
module
,
raise
an
error
if
window
.
getstr
()
or
window
.
instr
()
is
passed
a
negative
value
.
-
Issue
#
27783
:
Fix
possible
usage
of
uninitialized
memory
in
operator
.
methodcaller
.
-
Issue
#
27774
:
Fix
possible
Py_DECREF
on
unowned
object
in
_sre
.
-
Issue
#
27760
:
Fix
possible
integer
overflow
in
binascii
.
b2a_qp
.
...
...
Modules/_operator.c
View file @
64234293
...
...
@@ -931,7 +931,7 @@ static PyObject *
methodcaller_new
(
PyTypeObject
*
type
,
PyObject
*
args
,
PyObject
*
kwds
)
{
methodcallerobject
*
mc
;
PyObject
*
name
,
*
newargs
;
PyObject
*
name
;
if
(
PyTuple_GET_SIZE
(
args
)
<
1
)
{
PyErr_SetString
(
PyExc_TypeError
,
"methodcaller needs at least "
...
...
@@ -951,13 +951,7 @@ methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if
(
mc
==
NULL
)
return
NULL
;
newargs
=
PyTuple_GetSlice
(
args
,
1
,
PyTuple_GET_SIZE
(
args
));
if
(
newargs
==
NULL
)
{
Py_DECREF
(
mc
);
return
NULL
;
}
mc
->
args
=
newargs
;
name
=
PyTuple_GET_ITEM
(
args
,
0
);
Py_INCREF
(
name
);
PyUnicode_InternInPlace
(
&
name
);
mc
->
name
=
name
;
...
...
@@ -965,6 +959,12 @@ methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
Py_XINCREF
(
kwds
);
mc
->
kwds
=
kwds
;
mc
->
args
=
PyTuple_GetSlice
(
args
,
1
,
PyTuple_GET_SIZE
(
args
));
if
(
mc
->
args
==
NULL
)
{
Py_DECREF
(
mc
);
return
NULL
;
}
PyObject_GC_Track
(
mc
);
return
(
PyObject
*
)
mc
;
}
...
...
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