diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index db96e5604..7eee026ea 100644 --- a/Changelog-Trunk.txt +++ b/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] 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)); |