summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-04 13:46:25 -0800
committerJunio C Hamano <gitster@pobox.com>2016-03-04 13:46:25 -0800
commit6dd0a37c34e79e38aa611fce10dd5609ccc7c39a (patch)
tree16398d48aa45249acc7ac9c338bbbe7f5bf4c57f
parent49a435219730b8a0be22887f9e9c4d94b36d3f1f (diff)
parent8d5b3325e72444d365ded113487d2345c365f6d3 (diff)
downloadgit-6dd0a37c34e79e38aa611fce10dd5609ccc7c39a.tar.gz
Merge branch 'jk/tighten-alloc'
* jk/tighten-alloc: compat/mingw: brown paper bag fix for 50a6c8e
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index cfedcf9656..54c82ecf20 100644
--- 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);