summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-20 16:57:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-20 16:57:38 (GMT)
commit8b54c23437834b36bbb5f6de2f577400385da770 (patch)
tree1be1514c35a099216b33574ba10cc51f845f0acc /builtin
parent8545932d45c91437ac439b1a2df12cf397f71311 (diff)
downloadgit-8b54c23437834b36bbb5f6de2f577400385da770.zip
git-8b54c23437834b36bbb5f6de2f577400385da770.tar.gz
git-8b54c23437834b36bbb5f6de2f577400385da770.tar.bz2
ps_matched: xcalloc() takes nmemb and then element size
Even though multiplication is commutative, the order of arguments should be xcalloc(nmemb, size). ps_matched is an array of 1-byte element whose size is the same as the number of pathspec elements. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/checkout.c2
-rw-r--r--builtin/ls-files.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3e141fc..4f826e3 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -280,7 +280,7 @@ static int checkout_paths(const struct checkout_opts *opts,
if (opts->source_tree)
read_tree_some(opts->source_tree, &opts->pathspec);
- ps_matched = xcalloc(1, opts->pathspec.nr);
+ ps_matched = xcalloc(opts->pathspec.nr, 1);
/*
* Make sure all pathspecs participated in locating the paths
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 6fa2205..b6a7cb0 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
/* Treat unmatching pathspec elements as errors */
if (pathspec.nr && error_unmatch)
- ps_matched = xcalloc(1, pathspec.nr);
+ ps_matched = xcalloc(pathspec.nr, 1);
if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
die("ls-files --ignored needs some exclude pattern");