Issue #16971: Fix a refleak in the charmap decoder.

serhiy-storchaka · serhiy-storchaka · commit 2aee6a6460d8 · 2013-01-29T12:16:57.000+02:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -7383,27 +7383,35 @@ PyUnicode_DecodeCharmap(const char *s,
                     goto onError;
                 }
 
-                if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1)
+                if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1) {
+                    Py_DECREF(x);
                     goto onError;
+                }
                 PyUnicode_WRITE(writer.kind, writer.data, writer.pos, value);
                 writer.pos++;
             }
             else if (PyUnicode_Check(x)) {
-                if (PyUnicode_READY(x) == -1)
+                if (PyUnicode_READY(x) == -1) {
+                    Py_DECREF(x);
                     goto onError;
+                }
                 if (PyUnicode_GET_LENGTH(x) == 1) {
                     Py_UCS4 value = PyUnicode_READ_CHAR(x, 0);
                     if (value == 0xFFFE)
                         goto Undefined;
-                    if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1)
+                    if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1) {
+                        Py_DECREF(x);
                         goto onError;
+                    }
                     PyUnicode_WRITE(writer.kind, writer.data, writer.pos, value);
                     writer.pos++;
                 }
                 else {
                     writer.overallocate = 1;
-                    if (_PyUnicodeWriter_WriteStr(&writer, x) == -1)
+                    if (_PyUnicodeWriter_WriteStr(&writer, x) == -1) {
+                        Py_DECREF(x);
                         goto onError;
+                    }
                 }
             }
             else {
