summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Andrzej Hunt <andrzej@ahunt.org>2021-09-26 15:58:33 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-27 10:34:41 -0700
commit44d2aec6e8795ac22b9121b3d2ecf43589e8ecd2 (patch)
tree01dec43890b025294f6b3dc98c0fae211034c50d /builtin/merge.c
parentGit 2.33 (diff)
downloadtgif-44d2aec6e8795ac22b9121b3d2ecf43589e8ecd2.tar.xz
connect: also update offset for features without values
parse_feature_value() takes an offset, and uses it to seek past the point in features_list that we've already seen. However if the feature being searched for does not specify a value, the offset is not updated. Therefore if we call parse_feature_value() in a loop on a value-less feature, we'll keep on parsing the same feature over and over again. This usually isn't an issue: there's no point in using next_server_feature_value() to search for repeated instances of the same capability unless that capability typically specifies a value - but a broken server could send a response that omits the value for a feature even when we are expecting a value. Therefore we add an offset update calculation for the no-value case, which helps ensure that loops using next_server_feature_value() will always terminate. next_server_feature_value(), and the offset calculation, were first added in 2.28 in 2c6a403d96 (connect: add function to parse multiple v1 capability values, 2020-05-25). Thanks to Peff for authoring the test. Co-authored-by: Jeff King <peff@peff.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Andrzej Hunt <andrzej@ahunt.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions