oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix crash on handling wallmounted nodes with invalid param2 (#13487)

Browse source
This commit is contained in:
savilli 2023-05-18 20:31:04 +02:00 • committed by GitHub
parent 35112f2453
commit 5ba70cf5ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/mapnode.cpp
View file

@ -64,8 +64,10 @@ u8 MapNode::getFaceDir(const NodeDefManager *nodemgr,
f.param_type_2 == CPT2_COLORED_4DIR)
return getParam2() & 0x03;
if (allow_wallmounted && (f.param_type_2 == CPT2_WALLMOUNTED ||
f.param_type_2 == CPT2_COLORED_WALLMOUNTED))
return wallmounted_to_facedir[getParam2() & 0x07];
f.param_type_2 == CPT2_COLORED_WALLMOUNTED)) {
u8 wmountface = MYMIN(getParam2() & 0x07, DWM_COUNT - 1);
return wallmounted_to_facedir[wmountface];
}
return 0;
}
@ -73,9 +75,9 @@ u8 MapNode::getWallMounted(const NodeDefManager *nodemgr) const
{
const ContentFeatures &f = nodemgr->get(*this);
if (f.param_type_2 == CPT2_WALLMOUNTED ||
f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
return getParam2() & 0x07;
} else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE ||
f.param_type_2 == CPT2_COLORED_WALLMOUNTED)
return MYMIN(getParam2() & 0x07, DWM_COUNT - 1);
else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE ||
f.drawtype == NDT_PLANTLIKE ||
f.drawtype == NDT_PLANTLIKE_ROOTED) {
return 1;
@ -160,7 +162,7 @@ void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
}
} else if (cpt2 == CPT2_WALLMOUNTED ||
cpt2 == CPT2_COLORED_WALLMOUNTED) {
u8 wmountface = (param2 & 7);
u8 wmountface = MYMIN(param2 & 0x07, DWM_COUNT - 1);
if (wmountface <= 1)
return;