mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-10-01 01:26:38 -04:00
Merge pull request #270 from viraptor/delete_array
delete[] to match new[]
This commit is contained in:
commit
78f2235b41
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user