From: Julien Ramseier <j.ramseier@gmail.com>
Date: Tue, 21 Mar 2017 16:24:23 +0000 (-0400)
Subject: regex: fix newline matching with negated brackets
X-Git-Tag: v1.1.17~82
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9571c5314a8064eda8a56faa2ae2aeced34497a3;p=oweals%2Fmusl.git

regex: fix newline matching with negated brackets

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"
---

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 5a7b53a7..fb24556e 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 */