From 28b5e759f5e55f9b9ba508403dce2d02b98c154b Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 31 May 2006 07:55:58 +0000
Subject: * [Fixed]: - nullpo in pet.c caused by equipping without checking if
 the pet is available.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6882 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 3 +++
 src/map/clif.c      | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 508c3686b..625e74cf1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/31
+	* [Fixed]:
+	  - nullpo in pet.c caused by equipping without checking if the pet is available.
+	    [Lance]
 	* [Fixed]:
 	  - Latest client support completed! [Lance]
 	* [Fixed]:
diff --git a/src/map/clif.c b/src/map/clif.c
index e704d756e..57fd3d5b3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9263,8 +9263,10 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
 			if(sd->inventory_data[index]->type == 10)
 				RFIFOW(fd,4)=0x8000;	// 矢を無理やり装備できるように（−−；
 			pc_equipitem(sd,index,RFIFOW(fd,4));
-		} else
-			pet_equipitem(sd,index);
+		} else{
+			if(sd->pd)
+				pet_equipitem(sd,index);
+		}
 	}
 }
 
-- 
cgit v1.2.3-70-g09d2