Mercurial > cpython-lru_cache-weakref
changeset 81826:02c4ecc87f74
Issue #16971: Fix a refleak in the charmap decoder.
| author | Serhiy Storchaka <storchaka@gmail.com> |
|---|---|
| date | Tue, 29 Jan 2013 12:16:57 +0200 |
| parents | 9b25df066f37 (current diff) 625c397a7283 (diff) |
| children | 82be592d764d |
| files | Objects/unicodeobject.c |
| diffstat | 1 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Objects/unicodeobject.c Tue Jan 29 12:07:03 2013 +0200 +++ b/Objects/unicodeobject.c Tue Jan 29 12:16:57 2013 +0200 @@ -7383,27 +7383,35 @@ 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 {