From 80bd422922790ce2278ded14760e31087eabf39f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 17:11:24 +0000
Subject: [PATCH 2/2] Add PET_BUFF_COUNT guard on pet buff load to prevent
 out-of-bounds write

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 zone/zonedb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index efb6ce92d..f12f29425 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -3363,7 +3363,7 @@ void ZoneDatabase::LoadPetInfo(Client *client)
 				continue;
 			}
 
-			if (e.slot >= RuleI(Spells, MaxTotalSlotsPET)) {
+			if (e.slot >= RuleI(Spells, MaxTotalSlotsPET) || e.slot >= PET_BUFF_COUNT) {
 				continue;
 			}