diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/map.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1d758875b..c4fb28d31 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/09/07 + * Ensure a pointer is valid within map_readfromcache() before attempting to access its members. [Paradox924X] 2010/09/06 * Rev. 14400 Implemented Icescope's fix for devotion, reflect damage is no longer absorbed by the devoter. (bugreport:3189) [L0ne_W0lf] * As a folow up to r14301, increased MAX_REG_NUM to 256, to prevent possible data loss. diff --git a/src/map/map.c b/src/map/map.c index 790c1515a..27d7e01d8 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2719,7 +2719,7 @@ int map_readfromcache(struct map_data *m, char *buffer, char *decode_buffer) p += sizeof(struct map_cache_map_info) + info->len; } - if( i < header->map_count ) { + if( info && i < header->map_count ) { unsigned long size, xy; if( info->xs <= 0 || info->ys <= 0 ) |