From 85634d7a2e4b864c4ca3baa591e9479ffd5a2540 Mon Sep 17 00:00:00 2001 From: Kristjan Valur Jonsson Date: Thu, 31 May 2012 09:37:31 +0000 Subject: Issue #14909: A number of places were using PyMem_Realloc() apis and PyObject_GC_Resize() with incorrect error handling. In case of errors, the original object would be leaked. This checkin fixes those cases. --- Modules/unicodedata.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Modules/unicodedata.c') diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index ed79165770b..5c982f5c293 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -526,13 +526,16 @@ nfd_nfkd(PyObject *self, PyObject *input, int k) /* Hangul Decomposition adds three characters in a single step, so we need atleast that much room. */ if (space < 3) { + Py_UCS4 *new_output; osize += 10; space += 10; - output = PyMem_Realloc(output, osize*sizeof(Py_UCS4)); - if (output == NULL) { + new_output = PyMem_Realloc(output, osize*sizeof(Py_UCS4)); + if (new_output == NULL) { + PyMem_Free(output); PyErr_NoMemory(); return NULL; } + output = new_output; } /* Hangul Decomposition. */ if (SBase <= code && code < (SBase+SCount)) { -- cgit v1.2.3-65-gdbad