Browse Source

Merge branch 'rs/unpack-entry-leakfix'

Memory leak in an error codepath has been plugged.

* rs/unpack-entry-leakfix:
  sha1_file: release delta_stack on error in unpack_entry()
maint
Junio C Hamano 7 years ago
parent
commit
030e2938d2
  1. 5
      sha1_file.c

5
sha1_file.c

@ -2542,8 +2542,8 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset, @@ -2542,8 +2542,8 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
error("bad packed object CRC for %s",
sha1_to_hex(sha1));
mark_bad_packed_object(p, sha1);
unuse_pack(&w_curs);
return NULL;
data = NULL;
goto out;
}
}

@ -2681,6 +2681,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset, @@ -2681,6 +2681,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
if (final_size)
*final_size = size;

out:
unuse_pack(&w_curs);

if (delta_stack != small_delta_stack)

Loading…
Cancel
Save