Commit 46357688 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

remove_leading_path: use a strbuf for internal storage

This function strcpy's directly into a PATH_MAX-sized
buffer. There's only one caller, which feeds the git_dir into
it, so it's not easy to trigger in practice (even if you fed
a large $GIT_DIR through the environment or .git file, it
would have to actually exist and be accessible on the
filesystem to get to this point). We can fix it by moving to
a strbuf.
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent e9ba6781
......@@ -632,7 +632,7 @@ const char *relative_path(const char *in, const char *prefix,
const char *remove_leading_path(const char *in, const char *prefix)
static char buf[PATH_MAX + 1];
static struct strbuf buf = STRBUF_INIT;
int i = 0, j = 0;
if (!prefix || !prefix[0])
......@@ -661,11 +661,13 @@ const char *remove_leading_path(const char *in, const char *prefix)
return in;
while (is_dir_sep(in[j]))
if (!in[j])
strcpy(buf, ".");
strbuf_addstr(&buf, ".");
strcpy(buf, in + j);
return buf;
strbuf_addstr(&buf, in + j);
return buf.buf;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment