summaryrefslogtreecommitdiff
path: root/builtin/mv.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2014-02-16 16:06:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-18 23:51:56 (GMT)
commitd954828d45efbd4b53576e86066657e87391318d (patch)
treee9863eead8a070c6a3c60932f28463b7d9506bfe /builtin/mv.c
parenta68a67dea399f15305b059aa36c007cfdde2890e (diff)
downloadgit-d954828d45efbd4b53576e86066657e87391318d.zip
git-d954828d45efbd4b53576e86066657e87391318d.tar.gz
git-d954828d45efbd4b53576e86066657e87391318d.tar.bz2
builtin/mv: don't use memory after free
If 'src' already ends with a slash, then add_slash() will just return it, meaning that 'free(src_with_slash)' is actually 'free(src)'. Since we use 'src' later, this will result in use-after-free. In fact, this cannot happen because 'src' comes from internal_copy_pathspec() without the KEEP_TRAILING_SLASH flag, so any trailing '/' will have been stripped; but static analysis tools are not clever enough to realise this and so warn that 'src' could be used after having been free'd. Fix this by checking that 'src_w_slash' is indeed newly allocated memory. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mv.c')
-rw-r--r--builtin/mv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 21c46d1..7e26eb5 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -162,7 +162,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (strncmp(path, src_w_slash, len_w_slash))
break;
}
- free((char *)src_w_slash);
+ if (src_w_slash != src)
+ free((char *)src_w_slash);
if (last - first < 1)
bad = _("source directory is empty");