[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2.

[stefan.krah]

http://hg.python.org/cpython/rev/90c8fa612e5b
changeset:   78877:90c8fa612e5b
parent:      78874:a53fc9982e2a
parent:      78876:df663603e67a
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 08 11:19:27 2012 +0200
summary:
  Merge 3.2.

files:
  Modules/_io/bytesio.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -692,8 +692,10 @@
     }
     else {
         dict = PyDict_Copy(self->dict);
-        if (dict == NULL)
+        if (dict == NULL) {
+            Py_DECREF(initvalue);
             return NULL;
+        }
     }
 
     state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);

-- 
Repository URL: http://hg.python.org/cpython