Merge pull request #10439 from sverker/sverker/erts/re-run-trap-killed/OTP-19888

erts: Fix SEGV when killing process during yielding re:run

Author: rickard-green

erts/emulator/beam/erl_bif_re.c

@@ -1736,6 +1736,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3, bool first)
             Eterm *hp;
             BUMP_REDS(p, reds_consumed);
             sys_memcpy(restartp,&restart,sizeof(RestartContext));
+            pcre2_set_restart_data(restart.match_data, &restartp->restart_data);
             ERTS_VBUMP_ALL_REDS(p);
             hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
             magic_ref = erts_mk_magic_ref(&hp, &MSO(p), mbp);
@@ -1851,7 +1852,6 @@ static BIF_RETTYPE re_match_trap(BIF_ALIST_3)
     restartp = (RestartContext *) ERTS_MAGIC_BIN_DATA(mbp);
     loop_limit = MIN(reds_initial * LOOP_FACTOR, max_loop_limit);
     pcre2_set_loops_left(restartp->match_data, loop_limit);
-    pcre2_set_restart_data(restartp->match_data, &restartp->restart_data);
     pcre2_set_restart_flags(restartp->match_data,  0);
 
     rc = pcre2_match(NULL, NULL, 0, 0, 0, restartp->match_data, NULL);

lib/stdlib/test/re_SUITE.erl

@@ -36,6 +36,7 @@
          yield_on_subject_validation/1, bad_utf8_subject/1,
          error_info/1, subject_is_sub_binary/1, pattern_is_sub_binary/1,
          import/1,
+         kill_yielding/1,
 
          last_test/1]).
 
@@ -62,6 +63,7 @@ all() ->
      yield_on_subject_validation, bad_utf8_subject,
      error_info, subject_is_sub_binary, pattern_is_sub_binary,
      import,
+     kill_yielding,
 
      last_test].
 
@@ -1246,7 +1248,29 @@ build_exported(Hdr1, RE, Opts, Enc) ->
     Hdr2 = <<Title/binary, CRC2:32, HdrRest/binary>>,
     {re_exported_pattern, Hdr2, RE, Opts, Enc}.
 
+%% OTP-19888: Verify that process can handle being killed while yielding
+%% inside re:run without beam crash or memory leak.
+kill_yielding(Config) when is_list(Config) ->
+    Subject = binary:copy(~"hejsan", 100_000),
+    DoIt = fun(RE) ->
+                   {Pid, MRef} = spawn_monitor(fun() ->
+                                                       re:run(Subject, RE)
+                                               end),
+                   erlang:yield(),
+                   exit(Pid, kill),
+                   {'DOWN',MRef,process,Pid,killed} = receive_any()
+           end,
+
+    RE_string = ~B"\w+\d",
+    {ok, RE_compiled} = re:compile(RE_string, []),
+    DoIt(RE_string),
+    DoIt(RE_compiled),
+    ok.
 
+receive_any() ->
+    receive M -> M
+    after 1000 -> timeout
+    end.
 
 last_test(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),