2.3.6

Dvoid from Discord just reported a crash when trying to load a
custom tiles2.png that was encoded weirdly.

The problem is that we don't check the return value from LodePNG, so
LodePNG gives us a null pointer, and then SDL_CreateRGBSurfaceFrom
doesn't check this null pointer, which then propagates until we crash in
SDL_ConvertSurfaceFormat (or rather, one of its sub-functions), and we
would probably crash somewhere else anyway if it continued.

After properly checking LodePNG's return value, along with printing the
error, it turns out that Dvoid's custom tiles2.png had an "invalid CRC".
I don't know what this means but it sounds worrying. `feh` can read the
file correctly but it also reports a "CRC error".

desktop_version/src/GraphicsResources.cpp

@@ -22,6 +22,7 @@ extern "C"
 		const unsigned char* in,
 		size_t insize
 	);
+	extern const char* lodepng_error_text(unsigned code);
 }
 
 static SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool noAlpha = false)
@@ -33,6 +34,7 @@ static SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool no
 
 	unsigned char *data;
 	unsigned int width, height;
+	unsigned int error;
 
 	unsigned char *fileIn;
 	size_t length;
@@ -44,14 +46,20 @@ static SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool no
 	}
 	if (noAlpha)
 	{
-		lodepng_decode24(&data, &width, &height, fileIn, length);
+		error = lodepng_decode24(&data, &width, &height, fileIn, length);
 	}
 	else
 	{
-		lodepng_decode32(&data, &width, &height, fileIn, length);
+		error = lodepng_decode32(&data, &width, &height, fileIn, length);
 	}
 	FILESYSTEM_freeMemory(&fileIn);
 
+	if (error != 0)
+	{
+		fprintf(stderr, "Could not load %s: %s\n", filename, lodepng_error_text(error));
+		return NULL;
+	}
+
 	loadedImage = SDL_CreateRGBSurfaceFrom(
 		data,
 		width,

desktop_version/src/Input.cpp

@@ -1491,8 +1491,6 @@ static void menuactionpress(void)
         case 0:
             //back
             music.playef(11);
-            game.returnmenu();
-            map.nexttowercolour();
             break;
         default:
             //yep
@@ -1503,10 +1501,10 @@ static void menuactionpress(void)
             game.deletesettings();
             game.flashlight = 5;
             game.screenshake = 15;
-            game.createmenu(Menu::mainmenu);
-            map.nexttowercolour();
             break;
         }
+        game.returnmenu();
+        map.nexttowercolour();
         break;
     case Menu::clearcustomdatamenu:
         switch (game.currentmenuoption)

desktop_version/src/Render.cpp

@@ -159,7 +159,7 @@ static void menurender(void)
 #ifdef INTERIM_COMMIT
         graphics.Print( 310 - (SDL_arraysize(INTERIM_COMMIT) - 1) * 8, 220, INTERIM_COMMIT, tr/2, tg/2, tb/2);
 #endif
-        graphics.Print( 310 - (6*8), 230, "v2.3.5", tr/2, tg/2, tb/2);
+        graphics.Print( 310 - (6*8), 230, "v2.3.6", tr/2, tg/2, tb/2);
 
         if(music.mmmmmm){
             graphics.Print( 10, 230, "[MMMMMM Mod Installed]", tr/2, tg/2, tb/2);