kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge branch 'jc/fix-alloc-sortbuf-in-index-pack' 

A hotfix for what is in 2.5-rc but not in 2.4.

* jc/fix-alloc-sortbuf-in-index-pack:
  index-pack: fix allocation of sorted_by_pos array
maint
Junio C Hamano 10 years ago
parent
5bdb7a78ad 781d93067d
commit
0bf46af089
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      builtin/index-pack.c

16
builtin/index-pack.c
Unescape View File

@ -1227,7 +1227,7 @@ static void resolve_deltas(void)
* - append objects to convert thin pack to full pack if required * - append objects to convert thin pack to full pack if required
* - write the final 20-byte SHA-1 * - write the final 20-byte SHA-1
*/ */
static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved); static void fix_unresolved_deltas(struct sha1file *f);
static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1) static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1)
{ {
if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) { if (nr_ref_deltas + nr_ofs_deltas == nr_resolved_deltas) {
@ -1249,7 +1249,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
memset(objects + nr_objects + 1, 0, memset(objects + nr_objects + 1, 0,
nr_unresolved * sizeof(*objects)); nr_unresolved * sizeof(*objects));
f = sha1fd(output_fd, curr_pack); f = sha1fd(output_fd, curr_pack);
fix_unresolved_deltas(f, nr_unresolved); fix_unresolved_deltas(f);
strbuf_addf(&msg, _("completed with %d local objects"), strbuf_addf(&msg, _("completed with %d local objects"),
nr_objects - nr_objects_initial); nr_objects - nr_objects_initial);
stop_progress_msg(&progress, msg.buf); stop_progress_msg(&progress, msg.buf);
@ -1331,10 +1331,10 @@ static int delta_pos_compare(const void *_a, const void *_b)
return a->obj_no - b->obj_no; return a->obj_no - b->obj_no;
} }


static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved) static void fix_unresolved_deltas(struct sha1file *f)
{ {
struct ref_delta_entry **sorted_by_pos; struct ref_delta_entry **sorted_by_pos;
int i, n = 0; int i;


/* /*
* Since many unresolved deltas may well be themselves base objects * Since many unresolved deltas may well be themselves base objects
@ -1346,12 +1346,12 @@ static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
* before deltas depending on them, a good heuristic is to start * before deltas depending on them, a good heuristic is to start
* resolving deltas in the same order as their position in the pack. * resolving deltas in the same order as their position in the pack.
*/ */
sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos)); sorted_by_pos = xmalloc(nr_ref_deltas * sizeof(*sorted_by_pos));
for (i = 0; i < nr_ref_deltas; i++) for (i = 0; i < nr_ref_deltas; i++)
sorted_by_pos[n++] = &ref_deltas[i]; sorted_by_pos[i] = &ref_deltas[i];
qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare); qsort(sorted_by_pos, nr_ref_deltas, sizeof(*sorted_by_pos), delta_pos_compare);


for (i = 0; i < n; i++) { for (i = 0; i < nr_ref_deltas; i++) {
struct ref_delta_entry *d = sorted_by_pos[i]; struct ref_delta_entry *d = sorted_by_pos[i];
enum object_type type; enum object_type type;
struct base_data *base_obj = alloc_base_data(); struct base_data *base_obj = alloc_base_data();

Write Preview
Loading…
Cancel
Save