diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-27 01:08:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-27 01:40:12 +0300 |
| commit | 415860ebaeb990c0c8da27cc7aa565a137b97fe9 (patch) | |
| tree | 379bc512894f445da63207d58c0956ea503a5f01 /src/map/map.c | |
| parent | 30ba171e28b10c5f9355cab5902fa311a234d833 (diff) | |
| download | hercules-415860ebaeb990c0c8da27cc7aa565a137b97fe9.tar.gz hercules-415860ebaeb990c0c8da27cc7aa565a137b97fe9.tar.bz2 hercules-415860ebaeb990c0c8da27cc7aa565a137b97fe9.tar.xz hercules-415860ebaeb990c0c8da27cc7aa565a137b97fe9.zip | |
Fix possible buffer overflows with snprintf.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 16d5e645d..17156f631 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3741,7 +3741,7 @@ int map_readallmaps (void) { ShowStatus("Loading maps (using GRF files)...\n"); else { char mapcachefilepath[256]; - snprintf(mapcachefilepath, 256, "%s/%s%s", map->db_path, DBPATH, "map_cache.dat"); + safesnprintf(mapcachefilepath, 256, "%s/%s%s", map->db_path, DBPATH, "map_cache.dat"); ShowStatus("Loading maps (using %s as map cache)...\n", mapcachefilepath); if( (fp = fopen(mapcachefilepath, "rb")) == NULL ) { ShowFatalError("Unable to open map cache file "CL_WHITE"%s"CL_RESET"\n", mapcachefilepath); @@ -4396,7 +4396,7 @@ struct map_zone_data *map_merge_zone(struct map_zone_data *main, struct map_zone nullpo_retr(NULL, main); nullpo_retr(NULL, other); - snprintf(newzone, MAP_ZONE_NAME_LENGTH, "%s+%s", main->name, other->name); + safesnprintf(newzone, MAP_ZONE_NAME_LENGTH, "%s+%s", main->name, other->name); if( (zone = strdb_get(map->zone_db, newzone)) ) return zone;/* this zone has already been merged */ |