Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure a pointer is valid within map_readfromcache() before attempting to access its members.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14401 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Paradox924X 2010-09-07 22:43:18 +00:00
parent a41b86bfdc
commit e2ada0e1ea
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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.

2
src/map/map.c
View File

@ -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 )