diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-11-08 17:14:52 -0500 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-08 17:14:52 -0500 |
| commit | 15df8418a54ff69be2dd7152307c07820ca47d6e (patch) | |
| tree | d4523072dd61a4c80965b753d798b46b71905c27 /ref-filter.c | |
| parent | 4b6302c72f523609e35d81db236dc5382ac621a4 (diff) | |
| parent | 8e1c5fcf286322c019e376563781458e6a719231 (diff) | |
Merge branch 'jk/ref-filter-parsing-bugs'
Various tests exercising the transfer.credentialsInUrl configuration
are taught to avoid making requests which require resolving localhost
to reduce CI-flakiness.
* jk/ref-filter-parsing-bugs:
ref-filter: fix parsing of signatures with CRLF and no body
ref-filter: fix parsing of signatures without blank lines
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 914908fac5..9dc2cd1451 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1375,12 +1375,12 @@ static void find_subpos(const char *buf, /* subject is first non-empty line */ *sub = buf; /* subject goes to first empty line before signature begins */ - if ((eol = strstr(*sub, "\n\n"))) { + if ((eol = strstr(*sub, "\n\n")) || + (eol = strstr(*sub, "\r\n\r\n"))) { eol = eol < sigstart ? eol : sigstart; - /* check if message uses CRLF */ - } else if (! (eol = strstr(*sub, "\r\n\r\n"))) { + } else { /* treat whole message as subject */ - eol = strrchr(*sub, '\0'); + eol = sigstart; } buf = eol; *sublen = buf - *sub; |