fetch_token_overflow2.patch

diff --git a/ext/mbstring/oniguruma/regparse.c b/ext/mbstring/oniguruma/regparse.c
index d2925f1e81..17535d16bc 100644
--- a/ext/mbstring/oniguruma/regparse.c
+++ b/ext/mbstring/oniguruma/regparse.c
@@ -3581,6 +3590,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
       }
       else { /* string */
        p = tok->backp + enclen(enc, tok->backp);
+    if (p > end) p = end;
       }
       break;
     }