1 files changed, 5 insertions, 4 deletions
diff --git a/regcomp.c b/regcomp.c
index 23cb0ead9a..176aa6b8ef 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5663,10 +5663,11 @@ onig_transfer(regex_t* to, regex_t* from)
 extern void
 onig_chain_link_add(regex_t* to, regex_t* add)
 {
-  THREAD_ATOMIC_START;
-  REGEX_CHAIN_HEAD(to);
-  to->chain = add;
-  THREAD_ATOMIC_END;
+  /* THREAD_ATOMIC_START; */
+  do {
+    REGEX_CHAIN_HEAD(to);
+  } while (IS_NOT_NULL(ATOMIC_PTR_CAS(to->chain, (regex_t* )NULL, add)));
+  /* THREAD_ATOMIC_END; */
 }
 
 extern void