1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 5d10002846..2e412781af 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -17129,12 +17129,16 @@ static void f_submatch(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     return;
   }
 
+  if (no < 0 || no >= NSUBEXP) {
+    EMSGN(_("E935: invalid submatch number: %d"), no);
+    return;
+  }
   int retList = 0;
 
   if (argvars[1].v_type != VAR_UNKNOWN) {
     retList = get_tv_number_chk(&argvars[1], &error);
     if (error) {
-    return;
+      return;
     }
   }