* [PATCH] regex: fix newline matching with negated brackets
@ 2017-03-17 13:33 Julien Ramseier
2017-03-18 15:00 ` Julien Ramseier
0 siblings, 1 reply; 5+ messages in thread
From: Julien Ramseier @ 2017-03-17 13:33 UTC (permalink / raw)
To: musl
[-- 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 */
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] regex: fix newline matching with negated brackets
2017-03-17 13:33 [PATCH] regex: fix newline matching with negated brackets Julien Ramseier
@ 2017-03-18 15:00 ` Julien Ramseier
2017-03-18 15:39 ` Rich Felker
2017-03-19 3:30 ` Szabolcs Nagy
0 siblings, 2 replies; 5+ messages in thread
From: Julien Ramseier @ 2017-03-18 15:00 UTC (permalink / raw)
To: musl
Again with inline patch.
I suspect my emails are not received by anyone when adding an attachment...
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 */
> Le 17 mars 2017 à 14:33, Julien Ramseier <j.ramseier@gmail.com> a écrit :
>
> 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
>
> <regcomp-newline-neg-bracket.patch>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Re: [PATCH] regex: fix newline matching with negated brackets
2017-03-18 15:00 ` Julien Ramseier
@ 2017-03-18 15:39 ` Rich Felker
2017-03-19 3:30 ` Szabolcs Nagy
1 sibling, 0 replies; 5+ messages in thread
From: Rich Felker @ 2017-03-18 15:39 UTC (permalink / raw)
To: musl
On Sat, Mar 18, 2017 at 04:00:11PM +0100, Julien Ramseier wrote:
> Again with inline patch.
> I suspect my emails are not received by anyone when adding an attachment...
No, attached patch is fine and preferable. I saw the patch but I'm
waiting for nsz (who understands the regex code much better) to check
and make sure it looks ok.
Rich
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Re: [PATCH] regex: fix newline matching with negated brackets
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
1 sibling, 1 reply; 5+ messages in thread
From: Szabolcs Nagy @ 2017-03-19 3:30 UTC (permalink / raw)
To: musl
* Julien Ramseier <j.ramseier@gmail.com> [2017-03-18 16:00:11 +0100]:
> 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 */
>
looks good.
thanks
>
> > Le 17 mars 2017 à 14:33, Julien Ramseier <j.ramseier@gmail.com> a écrit :
> >
> > 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
> >
> > <regcomp-newline-neg-bracket.patch>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Re: [PATCH] regex: fix newline matching with negated brackets
2017-03-19 3:30 ` Szabolcs Nagy
@ 2017-03-21 16:25 ` Rich Felker
0 siblings, 0 replies; 5+ messages in thread
From: Rich Felker @ 2017-03-21 16:25 UTC (permalink / raw)
To: musl
On Sun, Mar 19, 2017 at 04:30:43AM +0100, Szabolcs Nagy wrote:
> * Julien Ramseier <j.ramseier@gmail.com> [2017-03-18 16:00:11 +0100]:
> > 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 */
> >
>
> looks good.
> thanks
Thanks for reviewing. Committing it.
Rich
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-21 16:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-17 13:33 [PATCH] regex: fix newline matching with negated brackets Julien Ramseier
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
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).