Skip to content

Commit

Permalink
midx: use real paths in lookup_multi_pack_index()
Browse files Browse the repository at this point in the history
This helper looks for a parsed multi-pack-index whose object directory
matches the given object_dir. Before going into the loop over the parsed
multi-pack-indexes, it calls find_odb() to ensure that the given
object_dir is actually a known object directory.

However, find_odb() uses real-path manipulations to compare the input to
the alternate directories. This same real-path comparison is not used in
the loop, leading to potential issues with the strcmp().

Update the method to use the real-path values instead.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
  • Loading branch information
derrickstolee committed Apr 21, 2022
1 parent 6cd33dc commit 34785a0
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions midx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,17 +1132,26 @@ static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
static struct multi_pack_index *lookup_multi_pack_index(struct repository *r,
const char *object_dir)
{
struct multi_pack_index *result = NULL;
struct multi_pack_index *cur;
char *obj_dir_real = real_pathdup(object_dir, 1);
struct strbuf cur_path_real = STRBUF_INIT;

/* Ensure the given object_dir is local, or a known alternate. */
find_odb(r, object_dir);
find_odb(r, obj_dir_real);

for (cur = get_multi_pack_index(r); cur; cur = cur->next) {
if (!strcmp(object_dir, cur->object_dir))
return cur;
strbuf_realpath(&cur_path_real, cur->object_dir, 1);
if (!strcmp(obj_dir_real, cur_path_real.buf)) {
result = cur;
goto cleanup;
}
}

return NULL;
cleanup:
free(obj_dir_real);
strbuf_release(&cur_path_real);
return result;
}

static int write_midx_internal(const char *object_dir,
Expand Down

0 comments on commit 34785a0

Please sign in to comment.