comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #270 from viraptor/delete_array 

delete[] to match new[]
This commit is contained in:
Charles J. Cliffe 2016-01-29 17:50:07 -05:00
parent c4dac53532 5a52783c22
commit 78f2235b41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/DataTree.cpp
View File

@ -45,7 +45,7 @@ DataElement::~DataElement() {
void DataElement::data_init(size_t data_size_in) { void DataElement::data_init(size_t data_size_in) {
if (data_val) { if (data_val) {
delete data_val; delete[] data_val;
data_val = NULL; data_val = NULL;
} }
data_size = data_size_in; data_size = data_size_in;
@ -837,7 +837,7 @@ void DataTree::nodeToXML(DataNode *elem, TiXmlElement *elxml) {
text = new TiXmlText(tmp_pstr); text = new TiXmlText(tmp_pstr);
element->LinkEndChild(text); element->LinkEndChild(text);
} }
delete tmp_pstr; delete[] tmp_pstr;
break; break;
case DATA_CHAR: case DATA_CHAR:
child->element()->get(tmp_char); child->element()->get(tmp_char);
@ -1598,7 +1598,7 @@ bool DataTree::SaveToFile(const std::string& filename, bool compress, int /* com
if (!compress) { if (!compress) {
free(serialized); free(serialized);
} else { } else {
delete compressed; delete[] compressed;
} }
return true; return true;
@ -1639,7 +1639,7 @@ bool DataTree::LoadFromFile(const std::string& filename) {
serialized = new char[dataSize]; serialized = new char[dataSize];
fastlz_decompress(compressed, compressedSize, serialized, dataSize); fastlz_decompress(compressed, compressedSize, serialized, dataSize);
delete compressed; delete[] compressed;
} else { } else {
serialized = new char[dataSize]; serialized = new char[dataSize];
fin.read(serialized, dataSize); fin.read(serialized, dataSize);