summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-02-29 05:02:59 -0500
committerJunio C Hamano <gitster@pobox.com>2016-02-29 11:04:23 -0800
commit8d5b3325e72444d365ded113487d2345c365f6d3 (patch)
tree60f6d84d555c6c3951a165d8543a915d4b9614eb
parent08c95df8faa25ab4c9ad3da45bc12abb9274d343 (diff)
downloadgit-8d5b3325e72444d365ded113487d2345c365f6d3.tar.gz
compat/mingw: brown paper bag fix for 50a6c8e
Commit 50a6c8e (use st_add and st_mult for allocation size computation, 2016-02-22) fixed up many xmalloc call-sites including ones in compat/mingw.c. But I screwed up one of them, which was half-converted to ALLOC_ARRAY, using a very early prototype of the function. And I never caught it because I don't build on Windows. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index ae16d089ad..af56c1fe61 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1028,7 +1028,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);