From 388bd4bd7622f6781260ed388f7c76b673adb0e1 Mon Sep 17 00:00:00 2001 From: Alexey Izbyshev Date: Sat, 25 Aug 2018 19:46:58 +0300 Subject: [PATCH] [3.7] bpo-34492: Modules/main.c: Fix copy_wstrlist() (GH-8910) (GH-8922) * Add missing NULL check reported by Svace static analyzer. * Fix clear_wstrlist() call on a wrong list. (cherry picked from commit eb746dbae8b320758ee08f811316d7f283435cc0) Co-authored-by: Alexey Izbyshev --- Modules/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/main.c b/Modules/main.c index f82bab2cb1b8..45148dc98391 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -1236,10 +1236,13 @@ copy_wstrlist(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) { - clear_wstrlist(i, list); + clear_wstrlist(i, list_copy); return NULL; } list_copy[i] = arg; -- 2.47.3