commit 388bd4bd7622f6781260ed388f7c76b673adb0e1
author Alexey Izbyshev <izbyshev@ispras.ru> Sat Aug 25 19:46:58 2018 +0300
committer Victor Stinner <vstinner@redhat.com> Sat Aug 25 18:46:58 2018 +0200
tree 243fa0711cc9cc8996582064f52434ab58ce45aa
parent 6dc8f0543749a6cedb548ae3df76547edfd9a6b9

[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 <izbyshev@ispras.ru>

Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index f82bab2..45148dc 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -1236,10 +1236,13 @@
     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;