diff options
| author | Haru <haru@dotalux.com> | 2013-09-21 03:47:19 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-21 03:50:26 +0200 |
| commit | 51241f66ad6e78cf56b91c41e524c00a1d5abeb2 (patch) | |
| tree | 0b03082e62425d126bbff387f09cad4ab0f2bd24 /src/map/map.c | |
| parent | 556834d0508101b70660c5904b24adacacced3e0 (diff) | |
| download | hercules-51241f66ad6e78cf56b91c41e524c00a1d5abeb2.tar.gz hercules-51241f66ad6e78cf56b91c41e524c00a1d5abeb2.tar.bz2 hercules-51241f66ad6e78cf56b91c41e524c00a1d5abeb2.tar.xz hercules-51241f66ad6e78cf56b91c41e524c00a1d5abeb2.zip | |
Fixed a potentially negative array subscript causing a mapserver crash
- Fixes bugreport:7717, special thanks to quesoph
http://hercules.ws/board/tracker/issue-7717-map-crash-when-warping-on-a-floating-npc/
- Also changed various map[foo].index to the map_id2index(foo) macro.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c index d4568766a..865682afc 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3167,7 +3167,7 @@ int map_readallmaps (void) { map[i].index = mapindex_name2id(map[i].name); - if ( index2mapid[map[i].index] != -1 ) { + if ( index2mapid[map_id2index(i)] != -1 ) { ShowWarning("Map %s already loaded!"CL_CLL"\n", map[i].name); if (map[i].cell && map[i].cell != (struct mapcell *)0xdeadbeaf) { aFree(map[i].cell); |