summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-07 23:51:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-07 23:51:55 (GMT)
commitce18135d862b5dbc731d203b27c279529e58b54b (patch)
treefdaa08600484cb4f2d803e010719cfa314b5f0e0 /sha1_file.c
parent9760662f1a7a06516ca249a73e5c1a6fb6c0e26e (diff)
parent98cf8156078eb5256d77d01786863185a1728140 (diff)
downloadgit-ce18135d862b5dbc731d203b27c279529e58b54b.zip
git-ce18135d862b5dbc731d203b27c279529e58b54b.tar.gz
git-ce18135d862b5dbc731d203b27c279529e58b54b.tar.bz2
Merge branch 'maint'
* maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c
index ba8c4f7..e3d0113 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -808,10 +808,12 @@ static int packed_delta_info(unsigned char *base_sha1,
* the result size.
*/
data = delta_head;
- get_delta_hdr_size(&data); /* ignore base size */
+
+ /* ignore base size */
+ get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
/* Read the result size */
- result_size = get_delta_hdr_size(&data);
+ result_size = get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
*sizep = result_size;
}
return 0;