Skip to content

Commit

Permalink
convert bare readlink to strbuf_readlink
Browse files Browse the repository at this point in the history
This particular readlink call never NUL-terminated its
result, making it a potential source of bugs (though there
is no bug now, as it currently always respects the length
field). Let's just switch it to strbuf_readlink which is
shorter and less error-prone.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed May 25, 2009
1 parent 9619ff1 commit 3cd7388
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -2014,18 +2014,15 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
die("stat(%s): %s", name, strerror(errno));
}
if (S_ISLNK(st.st_mode)) {
int ret;
char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
ret = readlink(name, buf, sizeof(buf));
if (ret < 0)
struct strbuf sb = STRBUF_INIT;
if (strbuf_readlink(&sb, name, st.st_size) < 0)
die("readlink(%s)", name);
if (ret == sizeof(buf))
die("symlink too long: %s", name);
prep_temp_blob(name, temp, buf, ret,
prep_temp_blob(name, temp, sb.buf, sb.len,
(one->sha1_valid ?
one->sha1 : null_sha1),
(one->sha1_valid ?
one->mode : S_IFLNK));
strbuf_release(&sb);
}
else {
/* we can borrow from the file in the work tree */
Expand Down

0 comments on commit 3cd7388

Please sign in to comment.