diff options
| author | shennetsind <ind@henn.et> | 2015-01-17 20:18:49 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-01-17 20:18:49 -0200 |
| commit | a3c4d675ba19df385be5d1e3966c61de7186da57 (patch) | |
| tree | 45b4a026a758afb1a54387cdadb91d55eba621f8 /src/map/battle.c | |
| parent | 3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a (diff) | |
| download | hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.gz hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.bz2 hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.tar.xz hercules-a3c4d675ba19df385be5d1e3966c61de7186da57.zip | |
27 Fixes
Addressing out of bounds read/write, pointless null checks on already deferenced variables.
Special Thanks to 4144 and Haruna!
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 7e7317935..f332dd330 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4783,6 +4783,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list #ifdef RENEWAL case NJ_TATAMIGAESHI: ATK_RATE(200); + /* Fall through */ case LK_SPIRALPIERCE: case ML_SPIRALPIERCE: // [malufett] if( skill_id != NJ_TATAMIGAESHI ){ @@ -5685,7 +5686,7 @@ int battle_damage_area(struct block_list *bl, va_list ap) { else status_fix_damage(src,bl,damage,0); clif->damage(bl,bl,amotion,dmotion,damage,1,ATK_BLOCK,0); - if( !(src && src->type == BL_PC && ((TBL_PC*)src)->state.autocast) ) + if( !(src->type == BL_PC && ((TBL_PC*)src)->state.autocast) ) skill->additional_effect(src, bl, CR_REFLECTSHIELD, 1, BF_WEAPON|BF_SHORT|BF_NORMAL,ATK_DEF,tick); map->freeblock_unlock(); } |