diff options
Diffstat (limited to 'src/utils/xml/tinyxml2.cpp')
| -rw-r--r-- | src/utils/xml/tinyxml2.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index 1c1f38493..7e2ef5ebb 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -68,8 +68,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 { @@ -89,7 +90,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(); @@ -108,7 +109,7 @@ namespace XML if (result != tinyxml2::XML_SUCCESS) { showErrorStatus(mDoc); - free(data); + delete [] data; } else { @@ -132,7 +133,7 @@ namespace XML if (!data) return; - char *buf = static_cast<char*>(calloc(size + 1, 1)); + char *buf = new char[size + 1]; strncpy(buf, data, size); buf[size] = 0; @@ -141,7 +142,7 @@ namespace XML if (result != tinyxml2::XML_SUCCESS) { showErrorStatus(mDoc); - free(buf); + delete [] buf; } else { @@ -151,7 +152,7 @@ namespace XML Document::~Document() { - free(mData); + delete [] mData; mData = nullptr; } |