From bdeaa9974cdaf8d223c1dff6812612cdb50fad14 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 6 Jul 2026 01:20:30 -0500
Subject: [PATCH 1/3] add protective code against vanilla misbehavior

---
 docs/changelog.txt    |  1 +
 plugins/getplants.cpp | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8e299189e7..3956615ec5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -59,6 +59,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `getplants`: added protective code to avoid misoperation when a plant has an invalid material (which should never happen, but...)
 
 ## Misc Improvements
 
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 69eba4b1d1..6ac8b429cb 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -478,41 +478,52 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
     }
 
     count = 0;
-    for (size_t i = 0; i < world->plants.all.size(); i++) {
-        const df::plant* plant = world->plants.all[i];
+    for (auto* plant : world->plants.all)
+    {
         df::map_block* cur = Maps::getTileBlock(plant->pos);
 
-        TRACE(log, out).print("Examining {} at ({}, {}, {}) [index={}]\n", world->raws.plants.all[plant->material]->id, plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
+        auto mat = plant->material;
+        if (mat < 0 || mat > world->raws.plants.all.size())
+        {
+            WARN(log, out).print("plant with invalid material {} in plant vector", mat);
+            continue;
+        }
+
+        TRACE(log, out).print("Examining {} at ({}, {}, {})\n", world->raws.plants.all[mat]->id, plant->pos.x, plant->pos.y, plant->pos.z);
 
         int x = plant->pos.x % 16;
         int y = plant->pos.y % 16;
-        if (plantSelections[plant->material] == selectability::OutOfSeason ||
-            plantSelections[plant->material] == selectability::Selectable) {
+        if (plantSelections[mat] == selectability::OutOfSeason ||
+            plantSelections[mat] == selectability::Selectable)
+        {
             if (exclude ||
-                plantSelections[plant->material] == selectability::OutOfSeason)
+                plantSelections[mat] == selectability::OutOfSeason)
                 continue;
         }
-        else {
+        else
+        {
             if (!exclude)
                 continue;
         }
         df::tiletype tt = cur->tiletype[x][y];
-        df::tiletype_material mat = tileMaterial(tt);
+        df::tiletype_material tile_mat = tileMaterial(tt);
         if ((treesonly || tt != tiletype::Shrub) && ENUM_ATTR(plant_type, is_shrub, plant->type))
             continue;
-        if ((shrubsonly || mat != tiletype_material::TREE) && !ENUM_ATTR(plant_type, is_shrub, plant->type))
+        if ((shrubsonly || tile_mat != tiletype_material::TREE) && !ENUM_ATTR(plant_type, is_shrub, plant->type))
             continue;
         if (cur->designation[x][y].bits.hidden)
             continue;
-        if (collectionCount[plant->material] >= maxCount)
+        if (collectionCount[mat] >= maxCount)
             continue;
-        if (deselect && Designations::unmarkPlant(plant)) {
-            collectionCount[plant->material]++;
+        if (deselect && Designations::unmarkPlant(plant))
+        {
+            collectionCount[mat]++;
             ++count;
         }
-        if (!deselect && designate(out, plant, farming)) {
-            DEBUG(log, out).print("Designated {} at ({}, {}, {}), {}\n", world->raws.plants.all[plant->material]->id, plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
-            collectionCount[plant->material]++;
+        if (!deselect && designate(out, plant, farming))
+        {
+            DEBUG(log, out).print("Designated {} at ({}, {}, {})\n", world->raws.plants.all[mat]->id, plant->pos.x, plant->pos.y, plant->pos.z);
+            collectionCount[mat]++;
             ++count;
         }
     }

From 3ae8e72f616d497158a4892af51f06dfce01565a Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 6 Jul 2026 01:33:55 -0500
Subject: [PATCH 2/3] add explicit cast

---
 plugins/getplants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 6ac8b429cb..72cefda5c4 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -483,7 +483,7 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
         df::map_block* cur = Maps::getTileBlock(plant->pos);
 
         auto mat = plant->material;
-        if (mat < 0 || mat > world->raws.plants.all.size())
+        if (mat < 0 || mat > int16_t(world->raws.plants.all.size()))
         {
             WARN(log, out).print("plant with invalid material {} in plant vector", mat);
             continue;

From 5b57f752fe28e6d522a012a0e634b2bd38b93ba9 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Tue, 7 Jul 2026 10:00:57 -0500
Subject: [PATCH 3/3] `>=` not `>`

Co-Authored-By: Quietust <1005195+quietust@users.noreply.github.com>
---
 plugins/getplants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 72cefda5c4..53219276bb 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -483,7 +483,7 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
         df::map_block* cur = Maps::getTileBlock(plant->pos);
 
         auto mat = plant->material;
-        if (mat < 0 || mat > int16_t(world->raws.plants.all.size()))
+        if (mat < 0 || mat >= int16_t(world->raws.plants.all.size()))
         {
             WARN(log, out).print("plant with invalid material {} in plant vector", mat);
             continue;