summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pet.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8e1686e58..3226156f1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/17
+ * Fixed possible crash on pet egg select. [Skotlex]
* Massive update on the way splash/area (non-ground) skills work. [Skotlex]
- the new column 'splash' in skill_db is now used to determine the area of
effect of all related skills (eg: splash range of fireball, area of effect
diff --git a/src/map/pet.c b/src/map/pet.c
index 9177440d4..ad9a4ddbc 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1068,6 +1068,9 @@ int pet_select_egg(struct map_session_data *sd,short egg_index)
{
nullpo_retr(0, sd);
+ if(egg_index < 0 || egg_index >= MAX_INVENTORY)
+ return 0; //Forged packet!
+
if(sd->status.inventory[egg_index].card[0] == (short)0xff00)
intif_request_petdata(sd->status.account_id, sd->status.char_id, MakeDWord(sd->status.inventory[egg_index].card[1], sd->status.inventory[egg_index].card[2]) );
else {