diff options
| author | panikon <panikon@zoho.com> | 2014-07-09 00:55:38 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-07-09 00:55:38 -0300 |
| commit | e829011073ff9906542b1bc0f5615f714c91eff0 (patch) | |
| tree | 3ee382d8c2ac32cf4fe8a191fd3664dcb019c288 | |
| parent | 29de937a2d8b485498fa9ce573efebfb64e8d669 (diff) | |
| download | hercules-e829011073ff9906542b1bc0f5615f714c91eff0.tar.gz hercules-e829011073ff9906542b1bc0f5615f714c91eff0.tar.bz2 hercules-e829011073ff9906542b1bc0f5615f714c91eff0.tar.xz hercules-e829011073ff9906542b1bc0f5615f714c91eff0.zip | |
Fixed possible crash in clif_getareachar_skillunit, related to issue 6561 (http://hercules.ws/board/tracker/issue-6561-unknown-map-server-crash/)
Follow up to 29de937a2d8b485498fa9ce573efebfb64e8d669
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index bc3e0ce9f..8ddae3326 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4622,6 +4622,8 @@ void clif_graffiti_entry(struct block_list *bl, struct skill_unit *su, enum send /// 099f <lenght>.W <id> L <creator id>.L <x>.W <y>.W <unit id>.L <range>.W <visible>.B (ZC_SKILL_ENTRY4) void clif_getareachar_skillunit(struct block_list *bl, struct skill_unit *su, enum send_target target) { struct packet_skill_entry p; + nullpo_retv(bl); + nullpo_retv(su); if( su->group->state.guildaura ) return; diff --git a/src/map/status.c b/src/map/status.c index 499c50e3b..915559260 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3414,6 +3414,7 @@ void status_calc_regen(struct block_list *bl, struct status_data *st, struct reg struct map_session_data *sd; int val, skill_lv, reg_flag; nullpo_retv(bl); + nullpo_retv(st); if( !(bl->type&BL_REGEN) || !regen ) return; |