Merge 3.2.

Stefan Krah · Stefan Krah · commit ea94ba45fa84 · 2012-09-08T11:19:27.000+02:00
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
@@ -692,8 +692,10 @@ bytesio_getstate(bytesio *self)
     }
     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);

Original file line number	Diff line number	Diff line change
`@@ -692,8 +692,10 @@ bytesio_getstate(bytesio *self)`
`692`	`692`	`}`
`693`	`693`	`else {`
`694`	`694`	`dict = PyDict_Copy(self->dict);`
`695`		`- if (dict == NULL)`
	`695`	`+ if (dict == NULL) {`
	`696`	`+ Py_DECREF(initvalue);`
`696`	`697`	`return NULL;`
	`698`	`+ }`
`697`	`699`	`}`
`698`	`700`
`699`	`701`	`state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);`