From d1699ac2b40903d37d14a84b7dfd2f8c568c9475 Mon Sep 17 00:00:00 2001 From: NadjaW Date: Sun, 28 Apr 2019 11:22:15 +0200 Subject: [PATCH] fontrenderer.cpp: prevent possible crash when text parameter == NULL Observed e.g. with undefined behavior within threads Signed-off-by: Thilo Graf --- src/driver/fontrenderer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/driver/fontrenderer.cpp b/src/driver/fontrenderer.cpp index 54ffe5d9e..425815d7b 100644 --- a/src/driver/fontrenderer.cpp +++ b/src/driver/fontrenderer.cpp @@ -469,6 +469,11 @@ void Font::paintFontPixel(fb_pixel_t *td, uint8_t src) void Font::RenderString(int x, int y, const int width, const char *text, const fb_pixel_t color, const int boxheight, const unsigned int flags, fb_pixel_t *buffer, int _stride) { + if (!text){ + dprintf(DEBUG_DEBUG,"\033[33m[Font] [%s - %d] ERROR! parameter text = [%p]\033[0m\n", __func__, __LINE__, text); + return; + } + bool render_to_fb = (buffer == NULL); if (render_to_fb && !frameBuffer->getActive()) return;