diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-01-12 15:36:09 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-01-12 15:36:09 +0000 |
| commit | ca22cc0abe93c28f3d296d99c239413bb0d079c4 (patch) | |
| tree | 9551083f2f73ed3bab0cb464d008625bdb323efa /src | |
| parent | 96d16729c2267491424478e623a492acaec6b35e (diff) | |
Auths: in plaintext authenticator, fix parsing of consecutive circuflex. Bug 2687
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/auths/get_data.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/src/auths/get_data.c b/src/src/auths/get_data.c index 602a1181a..88359658a 100644 --- a/src/src/auths/get_data.c +++ b/src/src/auths/get_data.c @@ -168,14 +168,20 @@ if (!ss) len = Ustrlen(ss); /* The character ^ is used as an escape for a binary zero character, which is -needed for the PLAIN mechanism. It must be doubled if really needed. */ +needed for the PLAIN mechanism. It must be doubled if really needed. + +The parsing ambiguity of ^^^ is taken as ^^ -> ^ ; ^ -> NUL - and there is +no way to get a leading ^ after a NUL. We would need to intro new syntax to +support that (probably preferring to take a more-standard exim list as a source +and concat the elements with intervening NULs. Either a magic marker on the +source string for client_send, or a new option). */ for (int i = 0; i < len; i++) if (ss[i] == '^') if (ss[i+1] != '^') ss[i] = 0; else - if (--len > ++i) memmove(ss + i, ss + i + 1, len - i); + if (--len > i+1) memmove(ss + i + 1, ss + i + 2, len - i); /* The first string is attached to the AUTH command; others are sent unembellished. */ |