Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/unpack-entry-leakfix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:53 +0000
(17:02 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:53 +0000
(17:02 +0900)
Memory leak in an error codepath has been plugged.
* rs/unpack-entry-leakfix:
sha1_file: release delta_stack on error in unpack_entry()
1
2
sha1_file.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
c3b931e
896dca3
)
diff --cc
sha1_file.c
index b60ae15f7068c157df6407933ea7ee94a53f0640,ba282c06bd5b2863b1fa86665ce1904124d2890b..b7bb38b44590f3d4ab56c9e3cd4ea3ef434e7447
---
1
/
sha1_file.c
---
2
/
sha1_file.c
+++ b/
sha1_file.c
@@@
-2676,11
-2596,10
+2676,12
@@@
void *unpack_entry(struct packed_git *p
free(external_base);
}
- *final_type = type;
- *final_size = size;
+ if (final_type)
+ *final_type = type;
+ if (final_size)
+ *final_size = size;
+ out:
unuse_pack(&w_curs);
if (delta_stack != small_delta_stack)