commit 822c790527eb4601e7303199ad78be4c9eb9bb72
author Benjamin Peterson <benjamin@python.org> Tue Dec 20 13:32:50 2011 -0600
committer Benjamin Peterson <benjamin@python.org> Tue Dec 20 13:32:50 2011 -0600
tree a5cf05c865324835f1945f0e4c114344ea4e899f
parent 97193c1a1600141107e78c851058098404c73d62
parent 53aa1d7c5756eda92bd3276dd38dfa1f0c4bcee2

merge 3.2

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1eb24dd..fd9175d 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -12591,9 +12591,13 @@
         y_data = PyUnicode_DATA(y);
         for (i = 0; i < PyUnicode_GET_LENGTH(x); i++) {
             key = PyLong_FromLong(PyUnicode_READ(x_kind, x_data, i));
-            value = PyLong_FromLong(PyUnicode_READ(y_kind, y_data, i));
-            if (!key || !value)
+            if (!key)
                 goto err;
+            value = PyLong_FromLong(PyUnicode_READ(y_kind, y_data, i));
+            if (!value) {
+                Py_DECREF(key);
+                goto err;
+            }
             res = PyDict_SetItem(new, key, value);
             Py_DECREF(key);
             Py_DECREF(value);