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

serhiy-storchaka · serhiy-storchaka · commit 6c83e739d7b1 · 2013-01-04T12:39:34.000+02:00
a key whose repr raise an exception.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.3.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 #16455: On FreeBSD and Solaris, if the locale is C, the
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -10672,7 +10672,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
`@@ -10672,7 +10672,7 @@ PyUnicode_Append(PyObject *p_left, PyObject right)`
`10672`	`10672`	`return;`
`10673`	`10673`	`}`
`10674`	`10674`	`left = *p_left;`
`10675`		`- if (right == NULL \|\| !PyUnicode_Check(left)) {`
	`10675`	`+ if (right == NULL \|\| left == NULL \|\| !PyUnicode_Check(left)) {`
`10676`	`10676`	`if (!PyErr_Occurred())`
`10677`	`10677`	`PyErr_BadInternalCall();`
`10678`	`10678`	`goto error;`