diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-08 01:51:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-08 01:51:55 +0200 |
| commit | ce18135d862b5dbc731d203b27c279529e58b54b (patch) | |
| tree | fdaa08600484cb4f2d803e010719cfa314b5f0e0 /sha1_file.c | |
| parent | Add Documentation/technical/pack-format.txt (diff) | |
| parent | count-delta: match get_delta_hdr_size() changes. (diff) | |
| download | git-ce18135d862b5dbc731d203b27c279529e58b54b.tar.xz git-ce18135d862b5dbc731d203b27c279529e58b54b.zip | |
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index ba8c4f7601..e3d011309a 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; |