From 66caacf2f0d6213b049a3097556e28e30440b900 Mon Sep 17 00:00:00 2001 From: xdegaye Date: Mon, 23 Oct 2017 18:08:41 +0200 Subject: bpo-30817: Fix PyErr_PrintEx() when no memory (#2526) --- Python/pythonrun.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Python/pythonrun.c') diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 25e2da44d9..17ec182b74 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -630,9 +630,15 @@ PyErr_PrintEx(int set_sys_last_vars) return; /* Now we know v != NULL too */ if (set_sys_last_vars) { - _PySys_SetObjectId(&PyId_last_type, exception); - _PySys_SetObjectId(&PyId_last_value, v); - _PySys_SetObjectId(&PyId_last_traceback, tb); + if (_PySys_SetObjectId(&PyId_last_type, exception) < 0) { + PyErr_Clear(); + } + if (_PySys_SetObjectId(&PyId_last_value, v) < 0) { + PyErr_Clear(); + } + if (_PySys_SetObjectId(&PyId_last_traceback, tb) < 0) { + PyErr_Clear(); + } } hook = _PySys_GetObjectId(&PyId_excepthook); if (hook) { -- cgit v1.2.1