summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 03:58:18 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-11 03:58:18 +0000
commit8f4b6a735e96dcf5ae00b2eb755914c30be68a68 (patch)
treeae2052924bd84253dc8e2dd03be98c90f56648b2
parent61ae7c610edea81a54ca2f98164cd04a9687f2c9 (diff)
downloadhercules-8f4b6a735e96dcf5ae00b2eb755914c30be68a68.tar.gz
hercules-8f4b6a735e96dcf5ae00b2eb755914c30be68a68.tar.bz2
hercules-8f4b6a735e96dcf5ae00b2eb755914c30be68a68.tar.xz
hercules-8f4b6a735e96dcf5ae00b2eb755914c30be68a68.zip
Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14422 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f1653fecd..e557cf89f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/10/10
+ * Added NULL initialization to info variable in map_readfromcache() to satiate compiler. (bugreport:4399) [Paradox924X]
* Applied Ai4rei's patch to eliminate unnecessary and redundant castle data saving. (bugreport:4471) [Paradox924X]
* Added a missing const qualifier to a variable. (bugreport:4472) [Paradox924X]
* Rev. 14418 Follow up from r14413, should take care of the errors from bugreport:4472. [L0ne_W0lf]
diff --git a/src/map/map.c b/src/map/map.c
index f7f1f3a49..be50cf887 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2707,7 +2707,7 @@ int map_readfromcache(struct map_data *m, char *buffer, char *decode_buffer)
{
int i;
struct map_cache_main_header *header = (struct map_cache_main_header *)buffer;
- struct map_cache_map_info *info;
+ struct map_cache_map_info *info = NULL;
unsigned char *p = buffer + sizeof(struct map_cache_main_header);
for(i = 0; i < header->map_count; i++) {