[CritFix] Protect regexp matcher from regexps with empty patterns

Issue: #4885
Closes: #4885

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lua/lua_regexp.c b/src/lua/lua_regexp.c
index 6e2b0dc22..4a209057e 100644
--- a/src/lua/lua_regexp.c
+++ b/src/lua/lua_regexp.c
@@ -543,6 +543,11 @@ lua_regexp_search(lua_State *L)
 				}
 
 				matched = TRUE;
+
+				if (start >= end) {
+					/* We found all matches, so no more hits are possible (protect from empty patterns) */
+					break;
+				}
 			}
 
 			if (!matched) {
@@ -749,7 +754,7 @@ lua_regexp_split(lua_State *L)
 					lua_rawseti(L, -2, ++i);
 					matched = TRUE;
 				}
-				else if (start == end) {
+				else if (start >= end) {
 					break;
 				}
 				old_start = end;