diff options
| author | Erlang/OTP <[email protected]> | 2010-04-21 14:55:14 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-21 14:55:14 +0000 |
| commit | 65ff752e8f578839148e00923810d504c9fbb03a (patch) | |
| tree | 2533310e1225e406d4afc45544d43b7f68e59df9 /erts | |
| parent | 9ac34d4580a6ba9af0f448cc3f1220036a0aa796 (diff) | |
| parent | e746278e696c1d107eaccadbca810739396a5a2a (diff) | |
| download | otp-65ff752e8f578839148e00923810d504c9fbb03a.tar.gz otp-65ff752e8f578839148e00923810d504c9fbb03a.tar.bz2 otp-65ff752e8f578839148e00923810d504c9fbb03a.zip | |
Merge branch 'ms/re_infinite_loop' into dev
* ms/re_infinite_loop:
Add testcase for infinite loop problem caused by reset of match_call_count
re: Fix non-termination for a certain regular expression
OTP-8589 Pcre may hang on a special regexp
A bug in re that could cause certain regular expression matches never to
terminate is corrected. (Thanks to Michael Santos and Gordon Guthrie.)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/pcre/pcre_exec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/pcre/pcre_exec.c b/erts/emulator/pcre/pcre_exec.c index 51625130c3..3fe13ca32e 100644 --- a/erts/emulator/pcre/pcre_exec.c +++ b/erts/emulator/pcre/pcre_exec.c @@ -5191,7 +5191,6 @@ for(;;) EDEBUGF(("Loop limit break detected")); return PCRE_ERROR_LOOP_LIMIT; RESTART_INTERRUPTED: - md->match_call_count = 0; md->loop_limit = extra_data->loop_limit; rc = match(NULL,NULL,NULL,0,md,0,NULL,0,0); *extra_data->loop_counter_return = |