diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-27 08:19:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-27 08:19:27 (GMT) |
| commit | b9e65c9024612809636cc0bd56376d484374858d (patch) | |
| tree | 1b1a1034a110bf8f9f22e1d55aa249324d487c34 /generic | |
| parent | d406fa1d0d72d212b0962b0f2e20f82b436b8205 (diff) | |
| parent | 99a464dbfc99a425d7f7bb571d575e43b0e63539 (diff) | |
| download | tcl-b9e65c9024612809636cc0bd56376d484374858d.zip tcl-b9e65c9024612809636cc0bd56376d484374858d.tar.gz tcl-b9e65c9024612809636cc0bd56376d484374858d.tar.bz2 | |
[Bug 3606139]: missing error check allows regexp to crash Tcl. Thanks to Tom Lane for providing the test-case and the patch.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/regcomp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/regcomp.c b/generic/regcomp.c index 65555aa..b15117b 100644 --- a/generic/regcomp.c +++ b/generic/regcomp.c @@ -738,6 +738,7 @@ parsebranch( /* NB, recursion in parseqatom() may swallow rest of branch */ parseqatom(v, stopper, type, lp, right, t); + NOERRN(); } if (!seencontent) { /* empty branch */ @@ -1234,6 +1235,7 @@ parseqatom( EMPTYARC(atom->end, rp); t->right = subre(v, '=', 0, atom->end, rp); } + NOERR(); assert(SEE('|') || SEE(stopper) || SEE(EOS)); t->flags |= COMBINE(t->flags, t->right->flags); top->flags |= COMBINE(top->flags, t->flags); |