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
c1f0295f
Commit
c1f0295f
authored
Mar 30, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Plain Diff
Issue #23783: Fixed memory leak in PyObject_ClearWeakRefs() in case of
MemoryError.
parents
cdbe029e
cb537c93
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
Objects/weakrefobject.c
Objects/weakrefobject.c
+4
-7
No files found.
Objects/weakrefobject.c
View file @
c1f0295f
...
@@ -900,10 +900,8 @@ PyObject_ClearWeakRefs(PyObject *object)
...
@@ -900,10 +900,8 @@ PyObject_ClearWeakRefs(PyObject *object)
if
(
*
list
!=
NULL
)
{
if
(
*
list
!=
NULL
)
{
PyWeakReference
*
current
=
*
list
;
PyWeakReference
*
current
=
*
list
;
Py_ssize_t
count
=
_PyWeakref_GetWeakrefCount
(
current
);
Py_ssize_t
count
=
_PyWeakref_GetWeakrefCount
(
current
);
int
restore_error
=
PyErr_Occurred
()
?
1
:
0
;
PyObject
*
err_type
,
*
err_value
,
*
err_tb
;
PyObject
*
err_type
,
*
err_value
,
*
err_tb
;
if
(
restore_error
)
PyErr_Fetch
(
&
err_type
,
&
err_value
,
&
err_tb
);
PyErr_Fetch
(
&
err_type
,
&
err_value
,
&
err_tb
);
if
(
count
==
1
)
{
if
(
count
==
1
)
{
PyObject
*
callback
=
current
->
wr_callback
;
PyObject
*
callback
=
current
->
wr_callback
;
...
@@ -922,8 +920,7 @@ PyObject_ClearWeakRefs(PyObject *object)
...
@@ -922,8 +920,7 @@ PyObject_ClearWeakRefs(PyObject *object)
tuple
=
PyTuple_New
(
count
*
2
);
tuple
=
PyTuple_New
(
count
*
2
);
if
(
tuple
==
NULL
)
{
if
(
tuple
==
NULL
)
{
if
(
restore_error
)
_PyErr_ChainExceptions
(
err_type
,
err_value
,
err_tb
);
PyErr_Fetch
(
&
err_type
,
&
err_value
,
&
err_tb
);
return
;
return
;
}
}
...
@@ -954,7 +951,7 @@ PyObject_ClearWeakRefs(PyObject *object)
...
@@ -954,7 +951,7 @@ PyObject_ClearWeakRefs(PyObject *object)
}
}
Py_DECREF
(
tuple
);
Py_DECREF
(
tuple
);
}
}
if
(
restore_error
)
assert
(
!
PyErr_Occurred
());
PyErr_Restore
(
err_type
,
err_value
,
err_tb
);
PyErr_Restore
(
err_type
,
err_value
,
err_tb
);
}
}
}
}
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