diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 93e8323a64..f456fbb5eb 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -326,8 +326,13 @@ static void gl_raster_font_render_line(
          unsigned skip                  = msg_tmp - &msg[i];
 
          if (skip > 1)
+         {
             i += skip - 1;
 
+            if (i >= msg_len)
+               break;
+         }
+
          glyph = font->font_driver->get_glyph(font->font_data, code);
 
          if (!glyph) /* Do something smarter here ... */