[PATCH 5/5] Make 'prepare_temp_file()' ignore st_size for symlinks
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Dec 17, 2008, 18:45 UTC
- Message-ID
- <alpine.LFD.2.00.0812171044110.14014@localhost.localdomain>
- In-Reply-To
- <alpine.LFD.2.00.0812171043440.14014@localhost.localdomain>
From: Linus Torvalds <torvalds@linux-foundation.org> Date: Wed, 17 Dec 2008 10:31:36 -0800
The code was already set up to not really need it, so this just massages it a bit to remove the use entirely.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---
There's a few raw 'readlink()' calls left, but they all seem to just have a big buffer and rely on the return value of readlink() rather than look too closely at st_size. But it would probably be good if somebody double-checked it all.
Even so, this should all be better than what we used to have, though.
diff.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c index 4b2029c..f160c1a 100644 --- a/diff.c +++ b/diff.c @@ -1881,13 +1881,12 @@ static void prepare_temp_file(const char *name, if (S_ISLNK(st.st_mode)) { int ret; char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */ - size_t sz = xsize_t(st.st_size); - if (sizeof(buf) <= st.st_size) - die("symlink too long: %s", name); - ret = readlink(name, buf, sz); + ret = readlink(name, buf, sizeof(buf)); if (ret < 0) die("readlink(%s)", name); - prep_temp_blob(temp, buf, sz, + if (ret == sizeof(buf)) + die("symlink too long: %s", name); + prep_temp_blob(temp, buf, ret, (one->sha1_valid ? one->sha1 : null_sha1), (one->sha1_valid ?
-- 1.6.1.rc3.3.gcc3e3