diff options
| author | Rickard Green <[email protected]> | 2019-06-18 22:31:20 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-06-18 22:31:20 +0200 |
| commit | 413d6d694eaf7530fd10bdc4dcafa4c7efa24e3e (patch) | |
| tree | cf981e5507f36e31ad5cea0f32a9782b52615f0c /erts/emulator/beam | |
| parent | 272ee2d47e7c648a1c5987429053d7a3ee208716 (diff) | |
| parent | 6cae8e7a45970ceb7fb1dd5bf974bf9ebe26144f (diff) | |
| download | otp-413d6d694eaf7530fd10bdc4dcafa4c7efa24e3e.tar.gz otp-413d6d694eaf7530fd10bdc4dcafa4c7efa24e3e.tar.bz2 otp-413d6d694eaf7530fd10bdc4dcafa4c7efa24e3e.zip | |
Merge branch 'rickard/re-yield-unicode-validation/OTP-15836/ERL-876' into rickard/re-unicode-validation/OTP-15831/OTP-15836/ERL-876
* rickard/re-yield-unicode-validation/OTP-15836/ERL-876:
Update runtime dependency from stdlib to erts
Yield when validating UTF8 for long subject in re:run()
Add yield_on_subject_validation() test
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_bif_re.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c index 8f872ecf45..b3bf1c7ee3 100644 --- a/erts/emulator/beam/erl_bif_re.c +++ b/erts/emulator/beam/erl_bif_re.c @@ -1428,6 +1428,7 @@ static BIF_RETTYPE re_exec_trap(BIF_ALIST_3) loop_count = 0xFFFFFFFF; #endif rc = erts_pcre_exec(NULL, &(restartp->extra), NULL, 0, 0, 0, NULL, 0); + ASSERT(loop_count != 0xFFFFFFFF); BUMP_REDS(BIF_P, loop_count / LOOP_FACTOR); if (rc == PCRE_ERROR_LOOP_LIMIT) { |