Mercurial > cpython-lru_cache-weakref
diff Objects/unicodeobject.c @ 81825:625c397a7283 3.3
Issue #16971: Fix a refleak in the charmap decoder.
| author | Serhiy Storchaka <storchaka@gmail.com> |
|---|---|
| date | Tue, 29 Jan 2013 12:13:22 +0200 |
| parents | 086defaf16fe |
| children | fec2976c8503 02c4ecc87f74 |
line wrap: on
line diff
--- a/Objects/unicodeobject.c Tue Jan 29 12:06:28 2013 +0200 +++ b/Objects/unicodeobject.c Tue Jan 29 12:13:22 2013 +0200 @@ -7510,14 +7510,18 @@ Py_DECREF(x); goto onError; } - if (unicode_putchar(&v, &outpos, value) < 0) + if (unicode_putchar(&v, &outpos, value) < 0) { + Py_DECREF(x); goto onError; + } } else if (PyUnicode_Check(x)) { Py_ssize_t targetsize; - if (PyUnicode_READY(x) == -1) + if (PyUnicode_READY(x) == -1) { + Py_DECREF(x); goto onError; + } targetsize = PyUnicode_GET_LENGTH(x); if (targetsize == 1) { @@ -7525,8 +7529,10 @@ Py_UCS4 value = PyUnicode_READ_CHAR(x, 0); if (value == 0xFFFE) goto Undefined; - if (unicode_putchar(&v, &outpos, value) < 0) + if (unicode_putchar(&v, &outpos, value) < 0) { + Py_DECREF(x); goto onError; + } } else if (targetsize > 1) { /* 1-n mapping */ @@ -7543,8 +7549,11 @@ goto onError; } } - if (unicode_widen(&v, outpos, PyUnicode_MAX_CHAR_VALUE(x)) < 0) + if (unicode_widen(&v, outpos, + PyUnicode_MAX_CHAR_VALUE(x)) < 0) { + Py_DECREF(x); goto onError; + } PyUnicode_CopyCharacters(v, outpos, x, 0, targetsize); outpos += targetsize; extrachars -= targetsize;