diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 20:49:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 20:49:23 (GMT) |
| commit | decba94d2c664229d16ee7c3cc442c0ada6090b9 (patch) | |
| tree | 96b6f8e90cc76ecc93d928f91ba53dbf7b3d6687 /sha1_file.c | |
| parent | 9b347673a1efbef525ff8b39f33f0b59e829be3c (diff) | |
| parent | 019d1e65f5bc715a40b1cd77852af0a649753c56 (diff) | |
| download | git-decba94d2c664229d16ee7c3cc442c0ada6090b9.zip git-decba94d2c664229d16ee7c3cc442c0ada6090b9.tar.gz git-decba94d2c664229d16ee7c3cc442c0ada6090b9.tar.bz2 | |
Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
Fix a small leak in the delta stack used when resolving a long
delta chain at runtime.
* nd/sha1-file-delta-stack-leakage-fix:
sha1_file: fix delta_stack memory leak in unpack_entry
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index b37c6f6..18b2378 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2288,6 +2288,10 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset, *final_size = size; unuse_pack(&w_curs); + + if (delta_stack != small_delta_stack) + free(delta_stack); + return data; } |