diff options
author | Carlos Martín Nieto <cmn@elego.de> | 2011-03-16 17:06:17 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 13:51:22 -0700 |
commit | 1d679de58e886e134c5569c542667a08f0faedd6 (patch) | |
tree | c2e1ca640d80925b0cbcd580e6b735e64ff2bde8 | |
parent | valgrind: ignore SSE-based strlen invalid reads (diff) | |
download | tgif-1d679de58e886e134c5569c542667a08f0faedd6.tar.xz |
make_absolute_path: return the input path if it points to our buffer
Some codepaths call make_absolute_path with its own return value as
input. In such a cases, return the path immediately.
This fixes a valgrind-discovered error, whereby we tried to copy a
string onto itself.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | abspath.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -24,6 +24,10 @@ const char *make_absolute_path(const char *path) char *last_elem = NULL; struct stat st; + /* We've already done it */ + if (path == buf || path == next_buf) + return path; + if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX) die ("Too long path: %.*s", 60, path); |