From 44d2aec6e8795ac22b9121b3d2ecf43589e8ecd2 Mon Sep 17 00:00:00 2001 From: Andrzej Hunt Date: Sun, 26 Sep 2021 15:58:33 +0000 Subject: 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 Signed-off-by: Jeff King Signed-off-by: Andrzej Hunt Signed-off-by: Junio C Hamano --- connect.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'connect.c') diff --git a/connect.c b/connect.c index 70b13389ba..71e8757e24 100644 --- a/connect.c +++ b/connect.c @@ -555,6 +555,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i if (!*value || isspace(*value)) { if (lenp) *lenp = 0; + if (offset) + *offset = found + len - feature_list; return value; } /* feature with a value (e.g., "agent=git/1.2.3") */ -- cgit v1.2.3