diff options
| author | shennetsind <ind@henn.et> | 2015-01-17 18:49:03 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-01-17 18:49:03 -0200 |
| commit | 3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a (patch) | |
| tree | 2f646d420976e459ef585debfca2ae55d3185528 /src/map/skill.c | |
| parent | 348044f12d5f683c8945e0eac642f2795050fb4e (diff) | |
| download | hercules-3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a.tar.gz hercules-3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a.tar.bz2 hercules-3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a.tar.xz hercules-3e53a34615c2535dbed3d7c2c7a00f1ef3eaff0a.zip | |
Another ~10 Fixes
Addressing out of bounds read/write.
Special Thanks to 4144 and Haruna!
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 749f06799..8c1d7e1e5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -10877,7 +10877,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui case SO_FIREWALK: case SO_ELECTRICWALK: - if( sc && sc->data[type] ) + if( sce ) status_change_end(src,type,INVALID_TIMER); clif->skill_nodamage(src, src ,skill_id, skill_lv, sc_start2(src,src, type, 100, skill_id, skill_lv, skill->get_time(skill_id, skill_lv))); @@ -18849,6 +18849,7 @@ bool skill_parse_row_improvisedb(char* split[], int columns, int current) { } if( current >= MAX_SKILL_IMPROVISE_DB ) { ShowError("skill_improvise_db: Maximum amount of entries reached (%d), increase MAX_SKILL_IMPROVISE_DB\n",MAX_SKILL_IMPROVISE_DB); + return false; } skill->improvise_db[current].skill_id = skill_id; skill->improvise_db[current].per = j; // Still need confirm it. |