diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-23 05:33:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-23 05:33:43 +0000 |
| commit | ce85933261d37a0cd5345687acc948fe5bfdabd0 (patch) | |
| tree | 05c0cc43281b8575000f0e249b88bb944be22af0 /posix/regcomp.c | |
| parent | 571f2090f876fee3eb99fd141d6595e6bc45549c (diff) | |
| download | glibc-ce85933261d37a0cd5345687acc948fe5bfdabd0.tar.gz glibc-ce85933261d37a0cd5345687acc948fe5bfdabd0.tar.xz glibc-ce85933261d37a0cd5345687acc948fe5bfdabd0.zip | |
Upate.
2003-09-20 Paolo Bonzini <bonzini@gnu.org> * posix/regcomp.c (peek_token): Don't look back for ( or | to check whether to treat a caret as special. It fails for the (extended) regex \(^. (parse, parse_reg_exp): Pass RE_CARET_ANCHORS_HERE to fetch_token. * posix/regex.h: Define RE_CARET_ANCHORS_HERE. * posix/regexec.c: Check out of bounds value before shifting. * posix/regex_internal.h: Define __attribute for non-gcc.
Diffstat (limited to 'posix/regcomp.c')
| -rw-r--r-- | posix/regcomp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c index d9212de3b9..4682ca6c1b 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -1650,12 +1650,11 @@ peek_token (token, input, syntax) token->type = OP_PERIOD; break; case '^': - if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) && + if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) && re_string_cur_idx (input) != 0) { char prev = re_string_peek_byte (input, -1); - if (prev != '|' && prev != '(' && - (!(syntax & RE_NEWLINE_ALT) || prev != '\n')) + if (!(syntax & RE_NEWLINE_ALT) || prev != '\n') break; } token->type = ANCHOR; @@ -1790,7 +1789,7 @@ parse (regexp, preg, syntax, err) bin_tree_t *tree, *eor, *root; re_token_t current_token; int new_idx; - current_token = fetch_token (regexp, syntax); + current_token = fetch_token (regexp, syntax | RE_CARET_ANCHORS_HERE); tree = parse_reg_exp (regexp, preg, ¤t_token, syntax, 0, err); if (BE (*err != REG_NOERROR && tree == NULL, 0)) return NULL; @@ -1837,7 +1836,7 @@ parse_reg_exp (regexp, preg, token, syntax, nest, err) { re_token_t alt_token = *token; new_idx = re_dfa_add_node (dfa, alt_token, 0); - *token = fetch_token (regexp, syntax); + *token = fetch_token (regexp, syntax | RE_CARET_ANCHORS_HERE); if (token->type != OP_ALT && token->type != END_OF_RE && (nest == 0 || token->type != OP_CLOSE_SUBEXP)) { |