From 63e9d31b74de06ed3635f253ad1409275e839202 Mon Sep 17 00:00:00 2001
From: wiidev <wiidev@users.noreply.github.com>
Date: Fri, 5 Feb 2021 19:51:15 +0000
Subject: [PATCH] Handle an OOM error when downloading

---
 source/menu/menu_download.cpp |  6 +++---
 source/network/https.c        | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp
index 193f016e..72aa7fcc 100644
--- a/source/menu/menu_download.cpp
+++ b/source/menu/menu_download.cpp
@@ -1658,10 +1658,10 @@ int CMenu::_gametdbDownloaderAsync()
 		m_thrdMessageAdded = true;
 		struct download file = {};
 		downloadfile(fmt(GAMETDB_URL, langCode.c_str()), &file);
-		if(file.size <= 0)
-		{
+		if(errno == ENOMEM)
+			return -1;
+		else if(file.size <= 0)
 			return -3;
-		}
 		else
 		{
 			update_pThread(1); // It's downloaded
diff --git a/source/network/https.c b/source/network/https.c
index 84cc5147..640fbdb2 100644
--- a/source/network/https.c
+++ b/source/network/https.c
@@ -165,6 +165,14 @@ bool read_chunked(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos
 #endif
             capacity *= 2;
             buffer->data = MEM2_realloc(buffer->data, capacity);
+            if (!buffer->data) // A custom theme is using too much memory
+            {
+#ifdef DEBUG_NETWORK
+                gprintf("Out of memory!\n");
+#endif
+                errno = ENOMEM;
+                return false;
+            }
         }
         if ((ret = https_read(httpinfo, &buffer->data[start_pos], capacity - start_pos, false)) < 1)
             return false;
@@ -200,6 +208,14 @@ bool read_all(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
 #endif
             capacity *= 2;
             buffer->data = MEM2_realloc(buffer->data, capacity);
+            if (!buffer->data) // A custom theme is using too much memory
+            {
+#ifdef DEBUG_NETWORK
+                gprintf("Out of memory!\n");
+#endif
+                errno = ENOMEM;
+                return false;
+            }
         }
         if ((ret = https_read(httpinfo, &buffer->data[start_pos], capacity - start_pos, false)) == 0)
             break;
@@ -347,7 +363,7 @@ void downloadfile(const char *url, struct download *buffer)
     }
     else
         return;
-    if (path == NULL)
+    if (!path)
         return;
     // Get the host
     int domainlength = path - url - 7 - httpinfo.use_https;
@@ -434,7 +450,7 @@ void downloadfile(const char *url, struct download *buffer)
             return;
         }
         // Attempt to resume the session
-        if (session != NULL && wolfSSL_set_session(httpinfo.ssl, session) != SSL_SUCCESS)
+        if (session && wolfSSL_set_session(httpinfo.ssl, session) != SSL_SUCCESS)
         {
 #ifdef DEBUG_NETWORK
             gprintf("Failed to set session (session timed out?)\n");
@@ -458,7 +474,7 @@ void downloadfile(const char *url, struct download *buffer)
             usleep(10000);
         }
         // Check if we resumed successfully
-        if (session != NULL && !wolfSSL_session_reused(httpinfo.ssl))
+        if (session && !wolfSSL_session_reused(httpinfo.ssl))
         {
 #ifdef DEBUG_NETWORK
             gprintf("Failed to resume session\n");