[PATCH] mailinfo: use starts_with() when checking scissors
- From
Andrei Rybak <rybak.a.v@gmail.com>
- Date
- Jun 8, 2021, 20:48 UTC
- Message-ID
- <20210608204841.2793591-1-rybak.a.v@gmail.com>
- In-Reply-To
- <20190401215334.18678-1-rybak.a.v@gmail.com>
Existing checks for scissors characters using memcmp(3) never read past the end of the line, because all substrings we are interested in are two characters long, and the outer loop guarantees we have at least one character. So at most we will look at the NUL.
However, this is too subtle and may lead to bugs in code which copies this behavior without realizing substring length requirement. So use starts_with() instead, which will stop at NUL regardless of the length of the prefix. Remove extra pair of parentheses while we are here.
Helped-by: Jeff King <peff@peff.net> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> --- mailinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
This patch was originally part of: https://public-inbox.org/git/20190401215334.18678-1-rybak.a.v@gmail.com/ I've finally gotten around to sending it on its own.
diff --git a/mailinfo.c b/mailinfo.c index ccc6beb27e..8013e5c566 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -705,8 +705,8 @@ static int is_scissors_line(const char *line) perforation++; continue; } - if ((!memcmp(c, ">8", 2) || !memcmp(c, "8<", 2) || - !memcmp(c, ">%", 2) || !memcmp(c, "%<", 2))) { + if (starts_with(c, ">8") || starts_with(c, "8<") || + starts_with(c, ">%") || starts_with(c, "%<")) { in_perforation = 1; perforation += 2; scissors += 2;
-- 2.31.1