undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/unpack-entry-leakfix' into maint

Browse Source 
Memory leak in an error codepath has been plugged.

* rs/unpack-entry-leakfix:
  sha1_file: release delta_stack on error in unpack_entry()
This commit is contained in:
Junio C Hamano 2017-09-10 17:02:53 +09:00
commit 438776e3d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sha1_file.c
View File

@ -2542,8 +2542,8 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
error("bad packed object CRC for %s", error("bad packed object CRC for %s",
sha1_to_hex(sha1)); sha1_to_hex(sha1));
mark_bad_packed_object(p, sha1); mark_bad_packed_object(p, sha1);
unuse_pack(&w_curs); data = NULL;
return NULL; goto out;
} }
} }
@ -2681,6 +2681,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
if (final_size) if (final_size)
*final_size = size; *final_size = size;
out:
unuse_pack(&w_curs); unuse_pack(&w_curs);
if (delta_stack != small_delta_stack) if (delta_stack != small_delta_stack)