mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/connect-parse-feature-v0-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-10-03 21:49:21 -07:00
parent 93cccedb8f 44d2aec6e8
commit 3a757d0369
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -557,6 +557,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i
if (!*value || isspace(*value)) { if (!*value || isspace(*value)) {
if (lenp) if (lenp)
*lenp = 0; *lenp = 0;
if (offset)
*offset = found + len - feature_list;
return value; return value;
} }
/* feature with a value (e.g., "agent=git/1.2.3") */ /* feature with a value (e.g., "agent=git/1.2.3") */

15
t/t5704-protocol-violations.sh
View File

@ -32,4 +32,19 @@ test_expect_success 'extra delim packet in v2 fetch args' '
test_i18ngrep "expected flush after fetch arguments" err test_i18ngrep "expected flush after fetch arguments" err
' '
test_expect_success 'bogus symref in v0 capabilities' '
test_commit foo &&
oid=$(git rev-parse HEAD) &&
dst=refs/heads/foo &&
{
printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
"$oid" "$GIT_DEFAULT_HASH" "$dst" |
test-tool pkt-line pack-raw-stdin &&
printf "0000"
} >input &&
git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
test_cmp expect actual
'
test_done test_done