Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint

diff --git a/compat/mingw.c b/compat/mingw.c
index cfedcf9656549050c1d97ab69000d4279d1b0b5e..54c82ecf201dde2c317efe6862173c1b40f2552d 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1069,7 +1069,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
                        free(quoted);
        }
 
-       wargs = xmalloc_array(st_add(st_mult(2, args.len), 1), sizeof(wchar_t));
+       ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));
        xutftowcs(wargs, args.buf, 2 * args.len + 1);
        strbuf_release(&args);