From 84c7535c191584661a477eb13d0fea62cbe935cb Mon Sep 17 00:00:00 2001
From: RaiKoHoff <rainer.kottenhoff@gmail.com>
Date: Mon, 2 Mar 2020 16:20:13 +0100
Subject: [PATCH] + fix: Oniguruma update (2020-03-02b)

---
 oniguruma/src/regexec.c | 13 ++++++++++++-
 oniguruma/version.txt   |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/oniguruma/src/regexec.c b/oniguruma/src/regexec.c
index f98bcbe38..79ffce122 100644
--- a/oniguruma/src/regexec.c
+++ b/oniguruma/src/regexec.c
@@ -4641,7 +4641,18 @@ onig_regset_search_with_param(OnigRegSet* set,
     for (i = 0; i < set->n; i++) {
       reg = set->rs[i].reg;
       if (reg->threshold_len == 0) {
-        REGSET_MATCH_AND_RETURN_CHECK(end);
+        /* REGSET_MATCH_AND_RETURN_CHECK(end); */
+        /* Can't use REGSET_MATCH_AND_RETURN_CHECK()
+           because r must be set regex index (i)
+        */
+        r = match_at(reg, str, end, end, s, prev, msas + i);
+        if (r != ONIG_MISMATCH) {
+          if (r >= 0) {
+            r = i;
+            goto match;
+          }
+          else goto finish; /* error */
+        }
       }
     }
 
diff --git a/oniguruma/version.txt b/oniguruma/version.txt
index e1e5d1369..c250d84b8 100644
--- a/oniguruma/version.txt
+++ b/oniguruma/version.txt
@@ -1 +1 @@
-6.9.5
+6.9.4