From f2d5cddfc8076fb3a0e9618bbd0c51a40b2b0922 Mon Sep 17 00:00:00 2001 From: Skabunkel <> Date: Sun, 24 Feb 2019 01:48:29 +0100 Subject: [PATCH 1/3] Fixed segmentation fult created by quick fix --- src/text.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/text.c b/src/text.c index f6a4a0d82..db8875b44 100644 --- a/src/text.c +++ b/src/text.c @@ -430,6 +430,7 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) spriteFont.chars[i].offsetX = 0; spriteFont.chars[i].offsetY = 0; spriteFont.chars[i].advanceX = 0; + spriteFont.chars[i].data = NULL; } spriteFont.baseSize = (int)spriteFont.chars[0].rec.height; @@ -686,7 +687,8 @@ void UnloadFont(Font font) { for (int i = 0; i < font.charsCount; i++) { - free(font.chars[i].data); + if(font.chars[i].data != NULL) + free(font.chars[i].data); } UnloadTexture(font.texture); free(font.chars); @@ -1442,6 +1444,7 @@ static Font LoadBMFont(const char *fileName) font.chars[i].offsetX = charOffsetX; font.chars[i].offsetY = charOffsetY; font.chars[i].advanceX = charAdvanceX; + font.chars[i].data = NULL; } fclose(fntFile); From 03f74835378a26c226ce3c45afae48c7488b8682 Mon Sep 17 00:00:00 2001 From: Skabunkel <> Date: Sun, 24 Feb 2019 01:56:17 +0100 Subject: [PATCH 2/3] Missed one --- src/text.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/text.c b/src/text.c index db8875b44..dc2b07ab1 100644 --- a/src/text.c +++ b/src/text.c @@ -512,6 +512,7 @@ CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int c if (type != FONT_SDF) chars[i].data = stbtt_GetCodepointBitmap(&fontInfo, scaleFactor, scaleFactor, ch, &chw, &chh, &chars[i].offsetX, &chars[i].offsetY); else if (ch != 32) chars[i].data = stbtt_GetCodepointSDF(&fontInfo, scaleFactor, ch, SDF_CHAR_PADDING, SDF_ON_EDGE_VALUE, SDF_PIXEL_DIST_SCALE, &chw, &chh, &chars[i].offsetX, &chars[i].offsetY); + else chars[i].data = NULL; if (type == FONT_BITMAP) { From fc11b360af4ea70adbbfd732512880bce18347b4 Mon Sep 17 00:00:00 2001 From: Skabunkel <> Date: Sun, 24 Feb 2019 01:57:31 +0100 Subject: [PATCH 3/3] ... tabs again... _facepalm_ --- src/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text.c b/src/text.c index dc2b07ab1..24f51f97a 100644 --- a/src/text.c +++ b/src/text.c @@ -512,7 +512,7 @@ CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int c if (type != FONT_SDF) chars[i].data = stbtt_GetCodepointBitmap(&fontInfo, scaleFactor, scaleFactor, ch, &chw, &chh, &chars[i].offsetX, &chars[i].offsetY); else if (ch != 32) chars[i].data = stbtt_GetCodepointSDF(&fontInfo, scaleFactor, ch, SDF_CHAR_PADDING, SDF_ON_EDGE_VALUE, SDF_PIXEL_DIST_SCALE, &chw, &chh, &chars[i].offsetX, &chars[i].offsetY); - else chars[i].data = NULL; + else chars[i].data = NULL; if (type == FONT_BITMAP) {