Fixed possibly placing a font glyph (at the beginning of a row) past the bottom of a font cache image.

1 files changed, 5 insertions, 11 deletions

diff --git a/src/renderer/tr_font.c b/src/renderer/tr_font.c
index 14349934..25954b66 100644
--- a/src/renderer/tr_font.c
+++ b/src/renderer/tr_font.c
@@ -234,17 +234,11 @@ static glyphInfo_t *RE_ConstructGlyphInfo(unsigned char *imageOut, int *xOut, in
 
     // we need to make sure we fit
     if (*xOut + scaled_width + 1 >= 255) {
-      if (*yOut + *maxHeight + 1 >= 255) {
-        *yOut = -1;
-        *xOut = -1;
-        ri.Free(bitmap->buffer);
-        ri.Free(bitmap);
-        return &glyph;
-      } else {
-        *xOut = 0;
-        *yOut += *maxHeight + 1;
-      }
-    } else if (*yOut + *maxHeight + 1 >= 255) {
+      *xOut = 0;
+      *yOut += *maxHeight + 1;
+    }
+
+    if (*yOut + *maxHeight + 1 >= 255) {
       *yOut = -1;
       *xOut = -1;
       ri.Free(bitmap->buffer);