Issue #16856: Fix a segmentation fault from calling repr() on a dict with

serhiy-storchaka · serhiy-storchaka · commit 4e02538bf375 · 2013-01-04T12:40:35.000+02:00
a key whose repr raise an exception.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #16856: Fix a segmentation fault from calling repr() on a dict with
+  a key whose repr raise an exception.
+
 - Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB.
 
 - Issue #16761: Calling int() with base argument only now raises TypeError.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -10548,7 +10548,7 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
         return;
     }
     left = *p_left;
-    if (right == NULL || !PyUnicode_Check(left)) {
+    if (right == NULL || left == NULL || !PyUnicode_Check(left)) {
         if (!PyErr_Occurred())
             PyErr_BadInternalCall();
         goto error;

Original file line number	Diff line number	Diff line change
`@@ -10548,7 +10548,7 @@ PyUnicode_Append(PyObject *p_left, PyObject right)`
`10548`	`10548`	`return;`
`10549`	`10549`	`}`
`10550`	`10550`	`left = *p_left;`
`10551`		`- if (right == NULL \|\| !PyUnicode_Check(left)) {`
	`10551`	`+ if (right == NULL \|\| left == NULL \|\| !PyUnicode_Check(left)) {`
`10552`	`10552`	`if (!PyErr_Occurred())`
`10553`	`10553`	`PyErr_BadInternalCall();`
`10554`	`10554`	`goto error;`