Merge branch 'jk/tighten-alloc'

gitster · gitster · commit 6dd0a37c34e7 · 2016-03-04T13:46:25.000-08:00
* jk/tighten-alloc:
  compat/mingw: brown paper bag fix for 50a6c8e
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -1069,7 +1069,7 @@ static pid_t mingw_spawnve_fd(const char cmd, const char argv, char *deltaen`
`1069`	`1069`	`free(quoted);`
`1070`	`1070`	`}`
`1071`	`1071`
`1072`		`- wargs = xmalloc_array(st_add(st_mult(2, args.len), 1), sizeof(wchar_t));`
	`1072`	`+ ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));`
`1073`	`1073`	`xutftowcs(wargs, args.buf, 2 * args.len + 1);`
`1074`	`1074`	`strbuf_release(&args);`
`1075`	`1075`