summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/pythonrun.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d779132422..2d91cb1e01 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.0 release candidate 1
Core and Builtins
-----------------
+- Issue #3663: Py_None was decref'd when printing SyntaxErrors.
+
- Issue #3657: Fix uninitialized memory read when pickling longs.
Found by valgrind.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 1ee062fe6f..39c86e749f 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1242,7 +1242,10 @@ PyErr_PrintEx(int set_sys_last_vars)
if (exception == NULL)
return;
PyErr_NormalizeException(&exception, &v, &tb);
- tb = tb ? tb : Py_None;
+ if (tb == NULL) {
+ tb = Py_None;
+ Py_INCREF(tb);
+ }
PyException_SetTraceback(v, tb);
if (exception == NULL)
return;