diff options
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/regexec.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index ca8f6a3f..5ef08afb 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2019-11-21 Arnold D. Robbins <arnold@skeeve.com> + + * regexec.c: Updated from GNULIB. + 2019-10-19 Arnold D. Robbins <arnold@skeeve.com> * regcomp.c, regex_internal.c, regex_internal.h, diff --git a/support/regexec.c b/support/regexec.c index 3c46ac81..38b6d671 100644 --- a/support/regexec.c +++ b/support/regexec.c @@ -1266,10 +1266,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, if (type == OP_BACK_REF) { Idx subexp_idx = dfa->nodes[node].opr.idx + 1; - naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so; + if (subexp_idx < nregs) + naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so; if (fs != NULL) { - if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1) + if (subexp_idx >= nregs + || regs[subexp_idx].rm_so == -1 + || regs[subexp_idx].rm_eo == -1) return -1; else if (naccepted) { |