Added empty buffer check for image download

Author: rsoric

src/include/ImageBMP.cpp

@@ -222,6 +222,11 @@ bool Image::drawBitmapFromWeb(const char *url, int x, int y, bool dither, bool i
         buf = downloadFileHTTPS(url, &defaultLen);
     }
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buf)
+        return 0;
+
     ret = drawBitmapFromBuffer(buf, x, y, dither, invert);
     free(buf);
 
@@ -251,6 +256,11 @@ bool Image::drawBitmapFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dit
     bool ret = 0;
     uint8_t *buf = downloadFile(s, len);
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buf)
+        return 0;
+
     ret = drawBitmapFromBuffer(buf, x, y, dither, invert);
     free(buf);
 
@@ -520,6 +530,11 @@ bool Image::drawBmpFromWebAtPosition(const char *url, const Position &position,
     int32_t defaultLen = E_INK_WIDTH * E_INK_HEIGHT * 4 + 150;
     uint8_t *buf = downloadFileHTTPS(url, &defaultLen);
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buf)
+        return 0;
+        
     bitmapHeader bmpHeader;
     readBmpHeader(buf, &bmpHeader);
 

src/include/ImageJPEG.cpp

@@ -134,6 +134,11 @@ bool Image::drawJpegFromWeb(const char *url, int x, int y, bool dither, bool inv
         buf = downloadFileHTTPS(url, &defaultLen);
     }
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buf)
+        return 0;
+
     ret = drawJpegFromBuffer(buf, defaultLen, x, y, dither, invert);
     free(buf);
 
@@ -172,6 +177,11 @@ bool Image::drawJpegFromWebAtPosition(const char *url, const Position &position,
         buff = downloadFileHTTPS(url, &defaultLen);
     }
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buff)
+        return 0;
+
     uint16_t w = 0;
     uint16_t h = 0;
     TJpgDec.setJpgScale(1);
@@ -288,6 +298,12 @@ bool Image::drawJpegFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dithe
 {
     bool ret = 0;
     uint8_t *buff = downloadFile(s, len);
+    
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
+    if (!buff)
+        return 0;
+    
     ret = drawJpegFromBuffer(buff, len, x, y, dither, invert);
     free(buff);
 

src/include/ImagePNG.cpp

@@ -233,6 +233,8 @@ bool Image::drawPngFromWeb(const char *url, int x, int y, bool dither, bool inve
         buf = downloadFileHTTPS(url, &defaultLen);
     }
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
     if (!buf)
         return 0;
 
@@ -280,6 +282,8 @@ bool Image::drawPngFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither
 
     uint8_t *buff = downloadFile(s, len);
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
     if (!buff)
         return 0;
 
@@ -325,6 +329,8 @@ bool Image::drawPngFromWebAtPosition(const char *url, const Position &position,
     int32_t defaultLen = E_INK_WIDTH * E_INK_HEIGHT * 4 + 100;
     uint8_t *buff = downloadFile(url, &defaultLen);
 
+    // Image sometimes doesn't download, so
+    // check if buffer is empty to avoid trying to draw an empty image
     if (!buff)
         return 0;