summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-02 18:41:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-06-02 23:00:56 +0300
commit6d97cdf25db274a81e9d9edc417b51cf44152733 (patch)
tree142f1cc00b1733bb54980a863932c96c7a98fa73 /src/resources
parent6b83725f3acf5a1e4dd08f4f243609fc66a38c22 (diff)
downloadplus-6d97cdf25db274a81e9d9edc417b51cf44152733.tar.gz
plus-6d97cdf25db274a81e9d9edc417b51cf44152733.tar.bz2
plus-6d97cdf25db274a81e9d9edc417b51cf44152733.tar.xz
plus-6d97cdf25db274a81e9d9edc417b51cf44152733.zip
Fix some memory leaks and missing initialisations.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/mapreader.cpp2
-rw-r--r--src/resources/resourcemanager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index c5e52ae7c..fb0298457 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -86,7 +86,7 @@ int inflateMemory(unsigned char *in, unsigned int inLength,
int ret;
z_stream strm;
- out = static_cast<unsigned char*>(malloc(bufferSize));
+ out = static_cast<unsigned char*>(calloc(bufferSize, 1));
strm.zalloc = Z_NULL;
strm.zfree = Z_NULL;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index a86edbb6f..aea598935 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -584,7 +584,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize)
fileSize = static_cast<int>(PHYSFS_fileLength(file));
// Allocate memory and load the file
- void *buffer = malloc(fileSize);
+ void *buffer = calloc(fileSize, 1);
PHYSFS_read(file, buffer, 1, fileSize);
// Close the file and let the user deallocate the memory