Skip to content

Commit 9e25a2e

Browse files
committed
Merge branch 'ah/connect-parse-feature-v0-fix' into maint
Protocol v0 clients can get stuck parsing a malformed feature line. * ah/connect-parse-feature-v0-fix: connect: also update offset for features without values
2 parents bbfc821 + 44d2aec commit 9e25a2e

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

connect.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i
557557
if (!*value || isspace(*value)) {
558558
if (lenp)
559559
*lenp = 0;
560+
if (offset)
561+
*offset = found + len - feature_list;
560562
return value;
561563
}
562564
/* feature with a value (e.g., "agent=git/1.2.3") */

t/t5704-protocol-violations.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,19 @@ test_expect_success 'extra delim packet in v2 fetch args' '
3232
test_i18ngrep "expected flush after fetch arguments" err
3333
'
3434

35+
test_expect_success 'bogus symref in v0 capabilities' '
36+
test_commit foo &&
37+
oid=$(git rev-parse HEAD) &&
38+
dst=refs/heads/foo &&
39+
{
40+
printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
41+
"$oid" "$GIT_DEFAULT_HASH" "$dst" |
42+
test-tool pkt-line pack-raw-stdin &&
43+
printf "0000"
44+
} >input &&
45+
git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
46+
printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
47+
test_cmp expect actual
48+
'
49+
3550
test_done

0 commit comments

Comments
 (0)