From: sfan5 <sfan5@live.de>
Date: Mon, 1 Jun 2020 19:19:35 +0000 (+0200)
Subject: Fix autoscale_mode segfault if tile doesn't have texture
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e698e63b3bc27551fda9bd4e66f72501413b4e6;p=oweals%2Fminetest.git

Fix autoscale_mode segfault if tile doesn't have texture

closes #9965
---

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index cb841e544..a84338752 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -608,8 +608,9 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
 	layer->material_type = material_type;
 
 	bool has_scale = tiledef.scale > 0;
-	if (((tsettings.autoscale_mode == AUTOSCALE_ENABLE) && !has_scale) ||
-			(tsettings.autoscale_mode == AUTOSCALE_FORCE)) {
+	bool use_autoscale = tsettings.autoscale_mode == AUTOSCALE_FORCE ||
+		(tsettings.autoscale_mode == AUTOSCALE_ENABLE && !has_scale);
+	if (use_autoscale && layer->texture) {
 		auto texture_size = layer->texture->getOriginalSize();
 		float base_size = tsettings.node_texture_size;
 		float size = std::fmin(texture_size.Width, texture_size.Height);