From 393359e63f41450f2b132c9c015bc78130b6fcae Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sun, 5 Apr 2020 03:27:04 +0100 Subject: [PATCH] Add some sanity checks --- src/Main.cpp | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index 125df8b6..d29aef7a 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -277,13 +277,16 @@ int main(int argc, char *argv[]) size_t window_icon_resource_size; const unsigned char *window_icon_resource_data = FindResource("ICON_MINI", "ICON", &window_icon_resource_size); - unsigned int window_icon_width, window_icon_height; - unsigned char *window_icon_rgb_pixels = DecodeBitmap(window_icon_resource_data, window_icon_resource_size, &window_icon_width, &window_icon_height); - - if (window_icon_rgb_pixels != NULL) + if (window_icon_resource_data != NULL) { - Backend_SetWindowIcon(window_icon_rgb_pixels, window_icon_width, window_icon_height); - FreeBitmap(window_icon_rgb_pixels); + unsigned int window_icon_width, window_icon_height; + unsigned char *window_icon_rgb_pixels = DecodeBitmap(window_icon_resource_data, window_icon_resource_size, &window_icon_width, &window_icon_height); + + if (window_icon_rgb_pixels != NULL) + { + Backend_SetWindowIcon(window_icon_rgb_pixels, window_icon_width, window_icon_height); + FreeBitmap(window_icon_rgb_pixels); + } } #endif @@ -291,13 +294,16 @@ int main(int argc, char *argv[]) size_t cursor_resource_size; const unsigned char *cursor_resource_data = FindResource("CURSOR_NORMAL", "CURSOR", &cursor_resource_size); - unsigned int cursor_width, cursor_height; - unsigned char *cursor_rgb_pixels = DecodeBitmap(cursor_resource_data, cursor_resource_size, &cursor_width, &cursor_height); - - if (cursor_rgb_pixels != NULL) + if (cursor_resource_data != NULL) { - Backend_SetCursor(cursor_rgb_pixels, cursor_width, cursor_height); - FreeBitmap(cursor_rgb_pixels); + unsigned int cursor_width, cursor_height; + unsigned char *cursor_rgb_pixels = DecodeBitmap(cursor_resource_data, cursor_resource_size, &cursor_width, &cursor_height); + + if (cursor_rgb_pixels != NULL) + { + Backend_SetCursor(cursor_rgb_pixels, cursor_width, cursor_height); + FreeBitmap(cursor_rgb_pixels); + } } if (IsKeyFile("fps"))