traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 74139 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74139 | benjamin.peterson | 2009-07-21 09:08:40 -0500 (Tue, 21 Jul 2009) | 1 line

  must use _PyThreadState_Current so it isn't checked for NULL #6530
........
This commit is contained in:
Benjamin Peterson 2009-07-21 14:11:27 +00:00
parent c8832655f9
commit 9d7c3cd6d7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/dictobject.c
View File

@ -714,10 +714,12 @@ PyDict_GetItem(PyObject *op, PyObject *key)
}
}
/* We can arrive here with a NULL tstate during initialization:
try running "python -Wi" for an example related to string
interning. Let's just hope that no exception occurs then... */
tstate = PyThreadState_GET();
/* We can arrive here with a NULL tstate during initialization: try
running "python -Wi" for an example related to string interning.
Let's just hope that no exception occurs then... This must be
_PyThreadState_Current and not PyThreadState_GET() because in debug
mode, it complains if tstate is NULL. */
tstate = _PyThreadState_Current;
if (tstate != NULL && tstate->curexc_type != NULL) {
/* preserve the existing exception */
PyObject *err_type, *err_value, *err_tb;