Skip to content

Commit

Permalink
bpo-38070: _Py_DumpTraceback() writes <no Python frame> (GH-16244)
Browse files Browse the repository at this point in the history
When a Python thread has no frame, _Py_DumpTraceback() and
_Py_DumpTracebackThreads() now write "<no Python frame>", rather than
writing nothing.
  • Loading branch information
vstinner authored Sep 17, 2019
1 parent 8fc5839 commit 8fa3e17
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions Python/traceback.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,12 +797,15 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
PyFrameObject *frame;
unsigned int depth;

if (write_header)
if (write_header) {
PUTS(fd, "Stack (most recent call first):\n");
}

frame = _PyThreadState_GetFrame(tstate);
if (frame == NULL)
if (frame == NULL) {
PUTS(fd, "<no Python frame>\n");
return;
}

depth = 0;
while (frame != NULL) {
Expand Down Expand Up @@ -870,9 +873,9 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
Python thread state of the current thread.
PyThreadState_Get() doesn't give the state of the thread that caused
the fault if the thread released the GIL, and so this function
cannot be used. Read the thread specific storage (TSS) instead: call
PyGILState_GetThisThreadState(). */
the fault if the thread released the GIL, and so
_PyThreadState_GET() cannot be used. Read the thread specific
storage (TSS) instead: call PyGILState_GetThisThreadState(). */
current_tstate = PyGILState_GetThisThreadState();
}

Expand Down

0 comments on commit 8fa3e17

Please sign in to comment.