From 8692796dd5ff6b3e9f0396e7bfd9893eeec578a8 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 30 May 2021 17:27:48 +0200
Subject: [PATCH] Add safeguards for drawText() & drawSizedText()

---
 radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp | 1 +
 radio/src/thirdparty/libopenui/src/bitmapbuffer.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
index 4ed1b2c97..b5b084766 100755
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
@@ -908,6 +908,7 @@ uint8_t BitmapBuffer::drawChar(coord_t x, coord_t y, const uint8_t * font, const
 
 coord_t BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t len, LcdFlags flags)
 {
+  if (!s) return (flags & VERTICAL) ? y : x;
   MOVE_OFFSET();
 
   int height = getFontHeight(flags);
diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
index 93b88a1e5..51d244497 100755
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
@@ -311,6 +311,7 @@ class BitmapBuffer: public BitmapBufferBase<pixel_t>
 
     coord_t drawText(coord_t x, coord_t y, const char * s, LcdFlags flags = 0)
     {
+      if (!s) return (flags & VERTICAL) ? y : x;
       return drawSizedText(x, y, s, 255, flags);
     }