From eb746dbae8b320758ee08f811316d7f283435cc0 Mon Sep 17 00:00:00 2001 From: Alexey Izbyshev <izbyshev@ispras.ru> Date: Sat, 25 Aug 2018 02:34:56 +0300 Subject: [PATCH] bpo-34492: Python/coreconfig.c: Fix _Py_wstrlist_copy() (GH-8910) bpo-34492: Python/coreconfig.c: Add missing NULL check to _Py_wstrlist_copy(). Fix _Py_wstrlist_clear() call on a wrong list. Reported by Svace static analyzer. --- Python/coreconfig.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Python/coreconfig.c b/Python/coreconfig.c index 1a32525b7b3..1b9e26e50a2 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -69,10 +69,13 @@ _Py_wstrlist_copy(int len, wchar_t **list) assert((len > 0 && list != NULL) || len == 0); size_t size = len * sizeof(list[0]); wchar_t **list_copy = PyMem_RawMalloc(size); + if (list_copy == NULL) { + return NULL; + } for (int i=0; i < len; i++) { wchar_t* arg = _PyMem_RawWcsdup(list[i]); if (arg == NULL) { - _Py_wstrlist_clear(i, list); + _Py_wstrlist_clear(i, list_copy); return NULL; } list_copy[i] = arg; -- 2.30.9