Skip to content

bpo-30860: Fix a refleak. #3567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 6 commits into from
Sep 14, 2017
Merged

bpo-30860: Fix a refleak. #3567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec69d0e
Drop warnoptions from PyInterpreterState.
ericsnowcurrently Sep 11, 2017
1c951ca
Drop xoptions from PyInterpreterState.
ericsnowcurrently Sep 11, 2017
006d9a0
Don't set warnoptions and _xoptions again.
ericsnowcurrently Sep 11, 2017
d789ea6
Decref after adding to sys.__dict__.
ericsnowcurrently Sep 11, 2017
2207aee
Drop an unused macro.
ericsnowcurrently Sep 11, 2017
fd6830a
Check sys.xoptions *before* we delete it.
ericsnowcurrently Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Drop xoptions from PyInterpreterState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 11, 2017
commit 1c951caedf44af489a1274903724f7125b4271f1
1 change: 0 additions & 1 deletion Include/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ typedef struct _is {

/* Used in Python/sysmodule.c. */
int check_interval;
PyObject *xoptions;

/* Used in Modules/_threadmodule.c. */
long num_threads;
Expand Down
1 change: 0 additions & 1 deletion Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ PyInterpreterState_New(void)
interp->builtins_copy = NULL;
interp->tstate_head = NULL;
interp->check_interval = 100;
interp->xoptions = NULL;
interp->num_threads = 0;
interp->pythread_stacksize = 0;
interp->codec_search_path = NULL;
Expand Down
8 changes: 6 additions & 2 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ extern const char *PyWin_DLLVersionString;

_Py_IDENTIFIER(_);
_Py_IDENTIFIER(__sizeof__);
_Py_IDENTIFIER(_xoptions);
_Py_IDENTIFIER(buffer);
_Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(encoding);
Expand Down Expand Up @@ -1533,13 +1534,16 @@ PySys_HasWarnOptions(void)
static PyObject *
get_xoptions(void)
{
PyObject *xoptions = PyThreadState_GET()->interp->xoptions;
PyObject *xoptions = _PySys_GetObjectId(&PyId__xoptions);
if (xoptions == NULL || !PyDict_Check(xoptions)) {
Py_XDECREF(xoptions);
xoptions = PyDict_New();
if (xoptions == NULL)
return NULL;
PyThreadState_GET()->interp->xoptions = xoptions;
if (_PySys_SetObjectId(&PyId__xoptions, xoptions)) {
Py_DECREF(xoptions);
return NULL;
}
}
return xoptions;
}
Expand Down