Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-12 17:33:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault with autoscale_mode (again)

Browse Source 
closes #12100
This time add some asserts so there is no misunderstanding about the NULL-ness of layer->texture.
This commit is contained in:
sfan5 2022-03-02 17:46:27 +01:00
parent 23d49fda29
commit d569dc45a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nodedef.cpp
View File

@ -675,7 +675,7 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
bool has_scale = tiledef.scale > 0; bool has_scale = tiledef.scale > 0;
bool use_autoscale = tsettings.autoscale_mode == AUTOSCALE_FORCE || bool use_autoscale = tsettings.autoscale_mode == AUTOSCALE_FORCE ||
(tsettings.autoscale_mode == AUTOSCALE_ENABLE && !has_scale); (tsettings.autoscale_mode == AUTOSCALE_ENABLE && !has_scale);
if (use_autoscale) { if (use_autoscale && layer->texture) {
auto texture_size = layer->texture->getOriginalSize(); auto texture_size = layer->texture->getOriginalSize();
float base_size = tsettings.node_texture_size; float base_size = tsettings.node_texture_size;
float size = std::fmin(texture_size.Width, texture_size.Height); float size = std::fmin(texture_size.Width, texture_size.Height);
@ -711,6 +711,7 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
// Animation parameters // Animation parameters
int frame_count = 1; int frame_count = 1;
if (layer->material_flags & MATERIAL_FLAG_ANIMATION) { if (layer->material_flags & MATERIAL_FLAG_ANIMATION) {
assert(layer->texture);
int frame_length_ms; int frame_length_ms;
tiledef.animation.determineParams(layer->texture->getOriginalSize(), tiledef.animation.determineParams(layer->texture->getOriginalSize(),
&frame_count, &frame_length_ms, NULL); &frame_count, &frame_length_ms, NULL);
@ -721,14 +722,13 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer,
if (frame_count == 1) { if (frame_count == 1) {
layer->material_flags &= ~MATERIAL_FLAG_ANIMATION; layer->material_flags &= ~MATERIAL_FLAG_ANIMATION;
} else { } else {
std::ostringstream os(std::ios::binary); assert(layer->texture);
if (!layer->frames) { if (!layer->frames)
layer->frames = new std::vector<FrameSpec>(); layer->frames = new std::vector<FrameSpec>();
}
layer->frames->resize(frame_count); layer->frames->resize(frame_count);
std::ostringstream os(std::ios::binary);
for (int i = 0; i < frame_count; i++) { for (int i = 0; i < frame_count; i++) {
FrameSpec frame; FrameSpec frame;
os.str(""); os.str("");