corrected previous fix. Init ptr in constructor to make coverity happy

This commit is contained in:
Brian Rasmusson
2016-09-22 22:01:39 +02:00
parent 4bf7d11d22
commit 48dfee6420
2 changed files with 12 additions and 7 deletions

@ -96,13 +96,15 @@ bool HighFrequencyTermShortcuts::load()
if(p!=end) {
//truncated, overlong, invalid, or bogus file
log(LOG_WARN,"Inconsistency or data error detected in %s", filename);
delete[] (char*)buffer;
delete[] new_buffer;
return false;
}
//ok, content seem to check out.
entries.swap(new_entries);
delete[] (char*)buffer;
if( buffer ) {
delete[] (char*)buffer;
}
buffer = new_buffer;
//All the entries are full 18-byte entries in all their glory
@ -146,8 +148,10 @@ bool HighFrequencyTermShortcuts::load()
void HighFrequencyTermShortcuts::unload()
{
entries.clear();
delete[] (char*)buffer;
buffer = 0;
if( buffer ) {
delete[] (char*)buffer;
}
buffer = NULL;
}

@ -17,9 +17,10 @@ class HighFrequencyTermShortcuts {
std::map<uint64_t,TermEntry> entries;
void *buffer;
public:
HighFrequencyTermShortcuts()
: entries()
{ }
HighFrequencyTermShortcuts() : entries() {
buffer=NULL;
}
~HighFrequencyTermShortcuts()
{ }