From ec7a1f02e7a36f062ecc40da1f17abd41f78b022 Mon Sep 17 00:00:00 2001 From: Desour Date: Sun, 29 Oct 2023 16:29:37 +0100 Subject: [PATCH] Fix out-of-bounds access in NodeDefManager::nodeboxConnects --- src/nodedef.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 303061e3c..cbfc77055 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -1773,8 +1773,9 @@ bool NodeDefManager::nodeboxConnects(MapNode from, MapNode to, }; if (f2.param_type_2 == CPT2_FACEDIR || f2.param_type_2 == CPT2_COLORED_FACEDIR) { + // FIXME: support arbitrary rotations (to.param2 & 0x1F) (#7696) return (f2.connect_sides - & rot[(connect_face * 4) + (to.param2 & 0x1F)]); + & rot[(connect_face * 4) + (to.param2 & 0x03)]); } else if (f2.param_type_2 == CPT2_4DIR || f2.param_type_2 == CPT2_COLORED_4DIR) { return (f2.connect_sides