mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 15:33:51 +00:00
Fix a potential memory leak
In particular, neglecting to call inflateEnd() along various codepaths in the inflate_tail() routine, would result in the failure to release zlib internal state. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
357bf82371
commit
c94eb4aa76
@ -341,8 +341,10 @@ static void *inflate_tail(z_stream *s, void *hb, size_t used, obj_hdr *hdr)
|
||||
* initial sequence of inflated data from the tail of the
|
||||
* head buffer, if any.
|
||||
*/
|
||||
if ((buf = git__malloc(hdr->size + 1)) == NULL)
|
||||
if ((buf = git__malloc(hdr->size + 1)) == NULL) {
|
||||
inflateEnd(s);
|
||||
return NULL;
|
||||
}
|
||||
tail = s->total_out - used;
|
||||
if (used > 0 && tail > 0) {
|
||||
if (tail > hdr->size)
|
||||
@ -354,7 +356,9 @@ static void *inflate_tail(z_stream *s, void *hb, size_t used, obj_hdr *hdr)
|
||||
/*
|
||||
* inflate the remainder of the object data, if any
|
||||
*/
|
||||
if (hdr->size >= used) {
|
||||
if (hdr->size < used)
|
||||
inflateEnd(s);
|
||||
else {
|
||||
set_stream_output(s, buf + used, hdr->size - used);
|
||||
if (finish_inflate(s)) {
|
||||
free(buf);
|
||||
|
Loading…
Reference in New Issue
Block a user