diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
index 9fda4fbb58..2b42146a6e 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
@@ -2260,7 +2260,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
     tile_width_sb = (sb_cols + (1 << parser->state.tile_cols_log2) -
         1) >> parser->state.tile_cols_log2;
     i = 0;
-    for (start_sb = 0; start_sb < sb_cols; start_sb += tile_width_sb) {
+    /* Fill mi_col_starts[] and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS;
+        start_sb += tile_width_sb) {
       parser->state.mi_col_starts[i] = start_sb << sb_shift;
       i += 1;
     }
@@ -2289,7 +2291,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
     tile_height_sb = (sb_rows + (1 << parser->state.tile_rows_log2) -
         1) >> parser->state.tile_rows_log2;
     i = 0;
-    for (start_sb = 0; start_sb < sb_rows; start_sb += tile_height_sb) {
+    /* Fill mi_row_starts[] and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS;
+        start_sb += tile_height_sb) {
       parser->state.mi_row_starts[i] = start_sb << sb_shift;
       i += 1;
     }
@@ -2304,7 +2308,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
   } else {
     widest_tile_sb = 0;
     start_sb = 0;
-    for (i = 0; start_sb < sb_cols; i++) {
+    /* Fill mi_col_starts[] and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS; i++) {
       parser->state.mi_col_starts[i] = start_sb << sb_shift;
       max_width = MIN (sb_cols - start_sb, max_tile_width_sb);
       tile_info->width_in_sbs_minus_1[i] =
@@ -2329,7 +2334,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
     max_tile_height_sb = MAX (max_tile_area_sb / widest_tile_sb, 1);
 
     start_sb = 0;
-    for (i = 0; start_sb < sb_rows; i++) {
+    /* Fill mi_row_starts[] and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS; i++) {
       parser->state.mi_row_starts[i] = start_sb << sb_shift;
       max_height = MIN (sb_rows - start_sb, max_tile_height_sb);
       tile_info->height_in_sbs_minus_1[i] =