diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-07-09 12:13:48 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-07-09 11:53:40 -0700 |
commit | 561fa03529202a36e0d77548fdcb5d81422c1865 (patch) | |
tree | f3dd9c9b67154d4cb45fe46bb780ea7528e62632 /merge-ort-wrappers.h | |
parent | pack-objects tests: cover blindspots in stdin handling (diff) | |
download | tgif-561fa03529202a36e0d77548fdcb5d81422c1865.tar.xz |
pack-objects: fix segfault in --stdin-packs option
Fix a segfault in the --stdin-packs option added in
339bce27f4f (builtin/pack-objects.c: add '--stdin-packs' option,
2021-02-22).
The read_packs_list_from_stdin() function didn't check that the lines
it was reading were valid packs, and thus when doing the QSORT() with
pack_mtime_cmp() we'd have a NULL "util" field. The "util" field is
used to associate the names of included/excluded packs with the
packed_git structs they correspond to.
The logic error was in assuming that we could iterate all packs and
annotate the excluded and included packs we got, as opposed to
checking the lines we got on stdin. There was a check for excluded
packs, but included packs were simply assumed to be valid.
As noted in the test we'll not report the first bad line, but whatever
line sorted first according to the string-list.c API. In this case I
think that's fine. There was further discussion of alternate
approaches in [1].
Even though we're being lazy let's assert the line we do expect to get
in the test, since whoever changes this code in the future might miss
this case, and would want to update the test and comments.
1. http://lore.kernel.org/git/YND3h2l10PlnSNGJ@nand.local
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort-wrappers.h')
0 files changed, 0 insertions, 0 deletions