summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-09-17 23:36:16 +0200
committerGitHub <noreply@github.com>2019-09-17 23:36:16 +0200
commit8fa3e1740b3f03ea65ddb68411c2238c5f98eec2 (patch)
treed70fd85eaacdd93ef7c6cec52ac8b9290ccaab00
parent8fc5839a9def34c13b6025c291434ba5fb5d6442 (diff)
downloadcpython-git-8fa3e1740b3f03ea65ddb68411c2238c5f98eec2.tar.gz
bpo-38070: _Py_DumpTraceback() writes <no Python frame> (GH-16244)
When a Python thread has no frame, _Py_DumpTraceback() and _Py_DumpTracebackThreads() now write "<no Python frame>", rather than writing nothing.
-rw-r--r--Python/traceback.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/Python/traceback.c b/Python/traceback.c
index f396f1ad98..8aaee12031 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -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) {
@@ -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();
}