summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:30:26 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 04:30:26 +0000
commit6ce604ea27be125d26422dfe3690608e3f1fa8d7 (patch)
tree91dab32c4da4c4ca7c3a90178cfe1789239d572e /src/map
parent190eab1994cf4dcc04bba32a53057cab28910a9e (diff)
downloadhercules-6ce604ea27be125d26422dfe3690608e3f1fa8d7.tar.gz
hercules-6ce604ea27be125d26422dfe3690608e3f1fa8d7.tar.bz2
hercules-6ce604ea27be125d26422dfe3690608e3f1fa8d7.tar.xz
hercules-6ce604ea27be125d26422dfe3690608e3f1fa8d7.zip
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14425 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 6a7f94e1e..b3dd475a1 100644
--- a/src/map/skill.c
+++ b/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));