Merge branch 'eb/apply' into next

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index ba8c4f76011c68548e959a17883b9a9d6cfbeeff..e3d011309a610ad2b81eeabe810e3844e946734b 100644 (file)
--- 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;