From: Julien Ramseier <j.ramseier@gmail.com>
To: musl@lists.openwall.com
Subject: [PATCH] regex: fix newline matching with negated brackets
Date: Fri, 17 Mar 2017 14:33:02 +0100 [thread overview]
Message-ID: <6600F15C-80E5-4CAE-8749-F77323C58D17@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
With REG_NEWLINE, POSIX says:
"A <newline> in string shall not be matched by a period outside
a bracket expression or by any form of a non-matching list"
musl currently matches newlines with negated brackets, even if
REG_NEWLINE is used. Attached patch fixes the issue, although
I'm not sure if it's the best way to do it.
Also see similar glibc bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=3957
[-- Attachment #2: regcomp-newline-neg-bracket.patch --]
[-- Type: application/octet-stream, Size: 774 bytes --]
diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 5a7b53a..fb24556 100644
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -636,6 +636,20 @@ static reg_errcode_t parse_bracket(tre_parse_ctx_t *ctx, const char *s)
goto parse_bracket_done;
if (neg.negate) {
+ /*
+ * With REG_NEWLINE, POSIX requires that newlines are not matched by
+ * any form of a non-matching list.
+ */
+ if (ctx->cflags & REG_NEWLINE) {
+ lit = tre_new_lit(&ls);
+ if (!lit) {
+ err = REG_ESPACE;
+ goto parse_bracket_done;
+ }
+ lit->code_min = '\n';
+ lit->code_max = '\n';
+ lit->position = -1;
+ }
/* Sort the array if we need to negate it. */
qsort(ls.a, ls.len, sizeof *ls.a, tre_compare_lit);
/* extra lit for the last negated range */
next reply other threads:[~2017-03-17 13:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 13:33 Julien Ramseier [this message]
2017-03-18 15:00 ` Julien Ramseier
2017-03-18 15:39 ` Rich Felker
2017-03-19 3:30 ` Szabolcs Nagy
2017-03-21 16:25 ` Rich Felker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6600F15C-80E5-4CAE-8749-F77323C58D17@gmail.com \
--to=j.ramseier@gmail.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).