Jelajahi Sumber

Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14425 54d463be-8e91-2dee-dedb-b68131a5f0ec
Paradox924X 14 tahun lalu
induk
melakukan
40feb456e8
2 mengubah file dengan 5 tambahan dan 0 penghapusan
  1. 2 0
      Changelog-Trunk.txt
  2. 3 0
      src/map/skill.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2010/10/11
+	* Applied ultramage's fix to prevent a segfault when a mob dead event triggered by a land-based skill causes the player to warp. (bugreport:4426) [Paradox924X]
 2010/10/10
 	* Applied Ai4rei's patch to prevent an invalid rid from being attached to the execution of a script. (bugreport:4470) [Paradox924X]
 	* Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X]

+ 3 - 0
src/map/skill.c

@@ -9902,6 +9902,9 @@ static int skill_trap_splash (struct block_list *bl, va_list ap)
 	unit = (struct skill_unit *)src;
 	tick = va_arg(ap,int);
 
+	if( !unit->alive || bl->prev == NULL )
+		return 0;
+
 	nullpo_ret(sg = unit->group);
 	nullpo_ret(ss = map_id2bl(sg->src_id));