From d60de4466ac9235e956d3eee94b5ade442f8279d Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 22 Jan 2017 22:01:39 +0100
Subject: [PATCH] [Horus] Malloc check added

---
 radio/src/cli.cpp                         |  4 +++
 radio/src/gui/480x272/bitmapbuffer.cpp    |  6 +++--
 radio/src/gui/480x272/fonts.cpp           |  7 +++---
 radio/src/gui/480x272/layout.h            |  8 ++++--
 radio/src/gui/480x272/themes/darkblue.cpp | 12 ++++++---
 radio/src/gui/480x272/themes/default.cpp  | 30 ++++++++++++++---------
 radio/src/storage/modelslist.h            |  6 ++++-
 7 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index 2896dc884..00e050e61 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -507,6 +507,10 @@ void printTaskSwitchLog()
   serialPrint("Tasks switch log at %u [<time>, <task_id>]:", get_tmr10ms());
   uint32_t lastSwitchTime = 0;
   uint32_t * tsl = new uint32_t[DEBUG_TASKS_LOG_SIZE];
+  if (!tsl) {
+    serialPrint("Not enough memory");
+    return 0;
+  }
   memcpy(tsl, taskSwitchLog, sizeof(taskSwitchLog));
   uint32_t * p = tsl + taskSwitchLogPos;
   uint32_t * end = tsl + DEBUG_TASKS_LOG_SIZE;
diff --git a/radio/src/gui/480x272/bitmapbuffer.cpp b/radio/src/gui/480x272/bitmapbuffer.cpp
index 080052b97..48ead775b 100644
--- a/radio/src/gui/480x272/bitmapbuffer.cpp
+++ b/radio/src/gui/480x272/bitmapbuffer.cpp
@@ -504,8 +504,10 @@ BitmapBuffer * BitmapBuffer::loadMaskOnBackground(const char * filename, LcdFlag
   BitmapBuffer * mask = BitmapBuffer::loadMask(getThemePath(filename));
   if (mask) {
     result = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
-    result->clear(background);
-    result->drawMask(0, 0, mask, foreground);
+    if (result) {
+      result->clear(background);
+      result->drawMask(0, 0, mask, foreground);
+    }
     delete mask;
   }
   return result;
diff --git a/radio/src/gui/480x272/fonts.cpp b/radio/src/gui/480x272/fonts.cpp
index 592f1f14b..32aa2d22b 100644
--- a/radio/src/gui/480x272/fonts.cpp
+++ b/radio/src/gui/480x272/fonts.cpp
@@ -94,9 +94,10 @@ BitmapBuffer * createFontCache(const uint8_t * font, LcdFlags fg, LcdFlags bg)
   coord_t height = *(((uint16_t *)font)+1);
 
   BitmapBuffer * buffer = new BitmapBuffer(BMP_RGB565, width, height);
-  buffer->clear(bg);
-  buffer->drawBitmapPattern(0, 0, font, fg);
-
+  if (buffer) {
+    buffer->clear(bg);
+    buffer->drawBitmapPattern(0, 0, font, fg);
+  }
   return buffer;
 }
 
diff --git a/radio/src/gui/480x272/layout.h b/radio/src/gui/480x272/layout.h
index f212bb473..bd5d562aa 100644
--- a/radio/src/gui/480x272/layout.h
+++ b/radio/src/gui/480x272/layout.h
@@ -98,14 +98,18 @@ class BaseLayoutFactory: public LayoutFactory
     virtual Layout * create(Layout::PersistentData * persistentData) const
     {
       Layout * layout = new T(this, persistentData);
-      layout->create();
+      if (layout) {
+        layout->create();
+      }
       return layout;
     }
 
     virtual Layout * load(Layout::PersistentData * persistentData) const
     {
       Layout * layout = new T(this, persistentData);
-      layout->load();
+      if (layout) {
+        layout->load();
+      }
       return layout;
     }
 
diff --git a/radio/src/gui/480x272/themes/darkblue.cpp b/radio/src/gui/480x272/themes/darkblue.cpp
index eb496ddf7..f7c66a27f 100644
--- a/radio/src/gui/480x272/themes/darkblue.cpp
+++ b/radio/src/gui/480x272/themes/darkblue.cpp
@@ -66,11 +66,15 @@ class DarkblueTheme: public Theme
       BitmapBuffer * mask = BitmapBuffer::loadMask(getThemePath(filename));
       if (mask) {
         menuIconNormal[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
-        menuIconNormal[index]->clear(HEADER_BGCOLOR);
-        menuIconNormal[index]->drawMask(0, 0, mask, HEADER_CURRENT_BGCOLOR);
+        if (menuIconNormal[index]) {
+          menuIconNormal[index]->clear(HEADER_BGCOLOR);
+          menuIconNormal[index]->drawMask(0, 0, mask, HEADER_CURRENT_BGCOLOR);
+        }
         menuIconSelected[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
-        menuIconSelected[index]->clear(HEADER_BGCOLOR);
-        menuIconSelected[index]->drawMask(0, 0, mask, MENU_TITLE_COLOR);
+        if (menuIconSelected[index]) {
+          menuIconSelected[index]->clear(HEADER_BGCOLOR);
+          menuIconSelected[index]->drawMask(0, 0, mask, MENU_TITLE_COLOR);
+        }
       }
     }
 
diff --git a/radio/src/gui/480x272/themes/default.cpp b/radio/src/gui/480x272/themes/default.cpp
index fccf6ffcd..6dfe486ee 100644
--- a/radio/src/gui/480x272/themes/default.cpp
+++ b/radio/src/gui/480x272/themes/default.cpp
@@ -74,12 +74,16 @@ class DefaultTheme: public Theme
       if (mask) {
         delete menuIconNormal[index];
         menuIconNormal[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
-        menuIconNormal[index]->clear(HEADER_BGCOLOR);
-        menuIconNormal[index]->drawMask(0, 0, mask, color);
+        if (menuIconNormal[index]) {
+          menuIconNormal[index]->clear(HEADER_BGCOLOR);
+          menuIconNormal[index]->drawMask(0, 0, mask, color);
+        }
         delete menuIconSelected[index];
         menuIconSelected[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
-        menuIconSelected[index]->clear(HEADER_CURRENT_BGCOLOR);
-        menuIconSelected[index]->drawMask(0, 0, mask, color);
+        if (menuIconSelected[index]) {
+          menuIconSelected[index]->clear(HEADER_CURRENT_BGCOLOR);
+          menuIconSelected[index]->drawMask(0, 0, mask, color);
+        }
         delete mask;
       }
     }
@@ -136,13 +140,17 @@ class DefaultTheme: public Theme
       BitmapBuffer * shadow = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_shadow.png"));
       BitmapBuffer * dot = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_dot.png"));
 
-      if (!currentMenuBackground) currentMenuBackground = new BitmapBuffer(BMP_RGB565, 36, 53);
-      currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->getWidth(), MENU_HEADER_HEIGHT, HEADER_BGCOLOR);
-      currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR);
-      currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->getWidth(), currentMenuBackground->getHeight() - MENU_TITLE_TOP, TITLE_BGCOLOR);
-      currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
-      currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR);
-      currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR);
+      if (!currentMenuBackground) {
+        currentMenuBackground = new BitmapBuffer(BMP_RGB565, 36, 53);
+      }
+      if (currentMenuBackground) {
+        currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->getWidth(), MENU_HEADER_HEIGHT, HEADER_BGCOLOR);
+        currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR);
+        currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->getWidth(), currentMenuBackground->getHeight() - MENU_TITLE_TOP, TITLE_BGCOLOR);
+        currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
+        currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR);
+        currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR);
+      }
 
       delete topleftBitmap;
       topleftBitmap = BitmapBuffer::loadMaskOnBackground("topleft.png", TITLE_BGCOLOR, HEADER_BGCOLOR);
diff --git a/radio/src/storage/modelslist.h b/radio/src/storage/modelslist.h
index 6f96b7130..fbd175bc1 100644
--- a/radio/src/storage/modelslist.h
+++ b/radio/src/storage/modelslist.h
@@ -50,13 +50,17 @@ class ModelCell
       const char * error = NULL;
 
       buffer = new BitmapBuffer(BMP_RGB565, MODELCELL_WIDTH, MODELCELL_HEIGHT);
-      buffer->clear(TEXT_BGCOLOR);
+      if (buffer == NULL) {
+        return;
+      }
 
       if (strncmp(modelFilename, g_eeGeneral.currModelFilename, LEN_MODEL_FILENAME) == 0)
         header = g_model.header;
       else
         error = readModel(modelFilename, (uint8_t *)&header, sizeof(header));
 
+      buffer->clear(TEXT_BGCOLOR);
+
       if (error) {
         buffer->drawText(5, 2, "(Invalid Model)", TEXT_COLOR);
         buffer->drawBitmapPattern(5, 23, LBM_LIBRARY_SLOT, TEXT_COLOR);