diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-28 20:20:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-28 23:25:13 +0300 |
| commit | 75a5173176adfc4bc417c10df137d9ea8d90d403 (patch) | |
| tree | 2d095e72f084ff96ee5ce3608453d98da0eda5d7 /src/utils/xml/libxml.cpp | |
| parent | b6831b3b3053b1777402a35d8b3ae3cca2f62bc4 (diff) | |
| download | manaplus-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.gz manaplus-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.bz2 manaplus-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.xz manaplus-75a5173176adfc4bc417c10df137d9ea8d90d403.zip | |
Change memory allocation in Virtfs::LoadFile from calloc to new.
Diffstat (limited to 'src/utils/xml/libxml.cpp')
| -rw-r--r-- | src/utils/xml/libxml.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index 87fb2577d..7abed4a09 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -98,8 +98,9 @@ namespace XML valid = true; if (useResman == UseVirtFs_true) { - data = static_cast<char*>(VirtFs::loadFile( - filename.c_str(), size)); + data = VirtFs::loadFile( + filename.c_str(), + size); } else { @@ -119,7 +120,7 @@ namespace XML else { file.seekg(0, std::ios::beg); - data = static_cast<char*>(malloc(size)); + data = new char[size]; file.read(data, size); } file.close(); @@ -133,7 +134,7 @@ namespace XML if (data) { mDoc = xmlParseMemory(data, size); - free(data); + delete [] data; if (!mDoc) { |