[PATCH] checkout-index.c: Unconditionally free memory
- From
Stefan Beller <sbeller@google.com>
- Date
- May 1, 2015, 22:35 UTC
- Message-ID
- <1430519737-6224-1-git-send-email-sbeller@google.com>
- In-Reply-To
- <1430508507-14016-1-git-send-email-sbeller@google.com>
It's safe to free the char pointer `p` unconditionally.
The pointer is assigned just 2 lines earlier as a return from prefix_path, which allocates new memory for its return value.
Then it is used in checkout_file, which passes the pointer on to cache_name_pos and write_tempfile_record, both of which do not store the pointer in any permanent record. So the condition on when to free the pointer is just "always".
Looking at the history this behavior must be fixed since at least (f5114a40c0d0, 2011-08-04, git-check-attr: Normalize paths), where the result of prefix_path is freed unconditionally.
Signed-off-by: Stefan Beller <sbeller@google.com> --- builtin/checkout-index.c | 6 ++---- builtin/update-index.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 9ca2da1..5325f92 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -249,8 +249,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) die("git checkout-index: don't mix '--stdin' and explicit filenames"); p = prefix_path(prefix, prefix_length, arg); checkout_file(p, prefix); - if (p < arg || p > arg + strlen(arg)) - free((char *)p); + free((char *)p); } if (read_from_stdin) { @@ -269,8 +268,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) } p = prefix_path(prefix, prefix_length, buf.buf); checkout_file(p, prefix); - if (p < buf.buf || p > buf.buf + buf.len) - free((char *)p); + free((char *)p); } strbuf_release(&nbuf); strbuf_release(&buf); diff --git a/builtin/update-index.c b/builtin/update-index.c index 6271b54..584efa5 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -534,8 +534,7 @@ static int do_unresolve(int ac, const char **av, const char *arg = av[i]; const char *p = prefix_path(prefix, prefix_length, arg); err |= unresolve_one(p); - if (p < arg || p > arg + strlen(arg)) - free((char *)p); + free((char *)p); } return err; }
-- 2.4.0.rc3.16.g0ab00b9