proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 06:51:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a potential memory leak

Browse Source 
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:
Ramsay Jones 2009-02-03 18:22:09 +00:00 committed by Shawn O. Pearce
parent 357bf82371
commit c94eb4aa76
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/odb.c
View File

@ -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 * initial sequence of inflated data from the tail of the
* head buffer, if any. * head buffer, if any.
*/ */
if ((buf = git__malloc(hdr->size + 1)) == NULL) if ((buf = git__malloc(hdr->size + 1)) == NULL) {
inflateEnd(s);
return NULL; return NULL;
}
tail = s->total_out - used; tail = s->total_out - used;
if (used > 0 && tail > 0) { if (used > 0 && tail > 0) {
if (tail > hdr->size) 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 * 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); set_stream_output(s, buf + used, hdr->size - used);
if (finish_inflate(s)) { if (finish_inflate(s)) {
free(buf); free(buf);