musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Szabolcs Nagy <nsz@port70.net>	2015年03月25日 18:25:09 +0000
committer	Rich Felker <dalias@aerifal.cx>	2015年03月27日 20:24:30 -0400
commit	c498efe117539a9d40d90b588c033316701c4b3e (patch)
tree	23a5ec4059db7e0baa14316f0c8cf32cd973e6cc
parent	32dee9b9b1e557a73cc4427455cd00cb2571436c (diff)
download	musl-c498efe117539a9d40d90b588c033316701c4b3e.tar.gz

regex: fix character class repetitions

Internally regcomp needs to copy some iteration nodes before translating the AST into TNFA representation. Literal nodes were not copied correctly: the class type and list of negated class types were not copied so classes were ignored (in the non-negated case an ignored char class caused the literal to match everything). This affects iterations when the upper bound is finite, larger than one or the lower bound is larger than one. So eg. the EREs [[:digit:]]{2} [^[:space:]ab]{1,4} were treated as .{2} [^ab]{1,4} The fix is done with minimal source modification to copy the necessary fields, but the AST preparation and node handling code of tre will need to be cleaned up for clarity.

Diffstat

-rw-r--r--

src/regex/regcomp.c

1 files changed, 5 insertions, 0 deletions

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index dfa9727c..978dd87f 100644
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c

@@ -1700,6 +1700,11 @@ tre_copy_ast(tre_mem_t mem, tre_stack_t *stack, tre_ast_node_t *ast,

*result = tre_ast_new_literal(mem, min, max, pos);

if (*result == NULL)

status = REG_ESPACE;

+ else {

+ tre_literal_t *p = (*result)->obj;

+ p->class = lit->class;

+ p->neg_classes = lit->neg_classes;

+ }

if (pos > *max_pos)

*max_pos = pos;

generated by cgit v1.2.1 (git 2.18.0) at 2025年09月02日 21:44:36 +0000