summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-02-26 23:11:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-27 09:03:37 (GMT)
commitee24ee55c28e46b502e4e2d219feced5a5d67e6b (patch)
tree02f9355fc287fc355f51cfdd51fa52bfcd890b04 /combine-diff.c
parent34fc5cefa7068492d5103b40dca1b55f69986eb8 (diff)
downloadgit-ee24ee55c28e46b502e4e2d219feced5a5d67e6b.zip
git-ee24ee55c28e46b502e4e2d219feced5a5d67e6b.tar.gz
git-ee24ee55c28e46b502e4e2d219feced5a5d67e6b.tar.bz2
diff --cc: integer overflow given a 2GB-or-larger file
Few of us use git to compare or even version-control 2GB files, but when we do, we'll want it to work. Reading a recent patch, I noticed two lines like this: int len = st.st_size; Instead of "int", that should be "size_t". Otherwise, in the non-symlink case, with 64-bit size_t, if the file's size is 2GB, the following xmalloc will fail: result = xmalloc(len + 1); trying to allocate 2^64 - 2^31 + 1 bytes (assuming sign-extension in the int-to-size_t promotion). And even if it didn't fail, the subsequent "result[len] = 0;" would be equivalent to an unpleasant "result[-2147483648] = 0;" The other nearby "int"-declared size variable, sz, should also be of type size_t, for the same reason. If sz ever wraps around and becomes negative, xread will corrupt memory _before_ the "result" buffer. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 6b7c6be..044633d 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -684,7 +684,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
goto deleted_file;
if (S_ISLNK(st.st_mode)) {
- int len = st.st_size;
+ size_t len = st.st_size;
result_size = len;
result = xmalloc(len + 1);
if (result_size != readlink(elem->path, result, len)) {
@@ -697,8 +697,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
}
else if (0 <= (fd = open(elem->path, O_RDONLY)) &&
!fstat(fd, &st)) {
- int len = st.st_size;
- int sz = 0;
+ size_t len = st.st_size;
+ size_t sz = 0;
elem->mode = canon_mode(st.st_mode);
result_size = len;