fix reused rtree nodes not being zeroed

Author: Maxxen

src/spatial/index/rtree/rtree.cpp

@@ -31,6 +31,11 @@ RTreePointer RTree::MakePage(RTreeNodeType type) const {
 	auto &alloc = type == RTreeNodeType::LEAF_PAGE ? *leaf_allocator : *node_allocator;
 	pointer = alloc.New();
 	pointer.SetMetadata(static_cast<uint8_t>(type));
+
+	// zero-initialize the node count
+	auto &node = RefMutable(pointer);
+	node.Clear();
+
 	return pointer;
 }
 
@@ -655,4 +660,4 @@ void RTree::Print() const {
 	Printer::Print(ToString());
 }
 
-} // namespace duckdb
+} // namespace duckdb

src/spatial/modules/main/spatial_functions_scalar.cpp

@@ -3003,7 +3003,6 @@ struct ST_Dump {
 	}
 };
 
-
 //======================================================================================================================
 // ST_Expand
 //======================================================================================================================
@@ -3016,28 +3015,29 @@ struct ST_Expand {
 	static void Execute(DataChunk &args, ExpressionState &state, Vector &result) {
 		auto &lstate = LocalState::ResetAndGet(state);
 
-		BinaryExecutor::Execute<string_t, double, string_t>(args.data[0], args.data[1], result, args.size(), [&](const string_t &blob, double distance) {
-			sgl::geometry geom;
-			lstate.Deserialize(blob, geom);
-			auto bbox = sgl::extent_xy::smallest();
-
-			if (sgl::ops::get_total_extent_xy(geom, bbox) == 0) {
-				const sgl::geometry empty(sgl::geometry_type::GEOMETRY_COLLECTION, false, false);
-				return lstate.Serialize(result, empty);
-			} else {
-				sgl::geometry expanded(sgl::geometry_type::POLYGON, false, false);
-				const auto min_x = bbox.min.x - distance;
-			    const auto min_y = bbox.min.y - distance;
-			    const auto max_x = bbox.max.x + distance;
-			    const auto max_y = bbox.max.y + distance;
-			    const double buffer[10] = {min_x, min_y, min_x, max_y, max_x, max_y, max_x, min_y, min_x, min_y};
+		BinaryExecutor::Execute<string_t, double, string_t>(
+		    args.data[0], args.data[1], result, args.size(), [&](const string_t &blob, double distance) {
+			    sgl::geometry geom;
+			    lstate.Deserialize(blob, geom);
+			    auto bbox = sgl::extent_xy::smallest();
 
-			    sgl::geometry ring(sgl::geometry_type::LINESTRING, false, false);
-			    ring.set_vertex_array(buffer, 5);
-				expanded.append_part(&ring);
-				return lstate.Serialize(result, expanded);
-			}
-		});
+			    if (sgl::ops::get_total_extent_xy(geom, bbox) == 0) {
+				    const sgl::geometry empty(sgl::geometry_type::GEOMETRY_COLLECTION, false, false);
+				    return lstate.Serialize(result, empty);
+			    } else {
+				    sgl::geometry expanded(sgl::geometry_type::POLYGON, false, false);
+				    const auto min_x = bbox.min.x - distance;
+				    const auto min_y = bbox.min.y - distance;
+				    const auto max_x = bbox.max.x + distance;
+				    const auto max_y = bbox.max.y + distance;
+				    const double buffer[10] = {min_x, min_y, min_x, max_y, max_x, max_y, max_x, min_y, min_x, min_y};
+
+				    sgl::geometry ring(sgl::geometry_type::LINESTRING, false, false);
+				    ring.set_vertex_array(buffer, 5);
+				    expanded.append_part(&ring);
+				    return lstate.Serialize(result, expanded);
+			    }
+		    });
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -3079,7 +3079,6 @@ struct ST_Expand {
 	}
 };
 
-
 //======================================================================================================================
 // ST_Extent
 //======================================================================================================================

test/sql/geometry/st_expand.test

@@ -1,3 +1,6 @@
+# name: test/sql/geometry/st_expand.test
+# group: [geometry]
+
 require spatial
 
 query I