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

[alexandre.vassalotti]

http://hg.python.org/cpython/rev/251c5b4bb05d
changeset:   83479:251c5b4bb05d
parent:      83477:80b1dc3b3231
parent:      83478:54a44184bada
user:        Alexandre Vassalotti <alexandre at peadrop.com>
date:        Sat Apr 20 21:28:49 2013 -0700
summary:
  Merge 3.3

files:
  Modules/_pickle.c |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -5058,11 +5058,13 @@
             if (result == NULL) {
                 Pdata_clear(self->stack, i + 1);
                 Py_SIZE(self->stack) = x;
+                Py_DECREF(append_func);
                 return -1;
             }
             Py_DECREF(result);
         }
         Py_SIZE(self->stack) = x;
+        Py_DECREF(append_func);
     }
 
     return 0;

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