nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for potential duplicate free

Browse Source
This commit is contained in:
john30
2018-04-08 19:07:49 +02:00
parent 00dce10324
commit 10e0c96ac2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ MainLoop::MainLoop(const struct options& opt, Device *device, MessageMap* messag
} else { } else {
logError(lf_main, "error registering data handlers"); logError(lf_main, "error registering data handlers");
} }
m_newlyDefinedMessages = opt.enableDefine ? new MessageMap(true) : NULL; m_newlyDefinedMessages = opt.enableDefine ? new MessageMap(true, "", false) : NULL;
} }
MainLoop::~MainLoop() { MainLoop::~MainLoop() {
src/lib/ebus/message.cpp
+2 -2
View File
@@ -474,8 +474,8 @@ result_t Message::create(const string& filename, const DataFieldTemplates* templ
return RESULT_OK; return RESULT_OK;
} }
Message* Message::createScanMessage(bool broadcast) { Message* Message::createScanMessage(bool broadcast, bool deleteData) {
return new Message("scan", "", "", 0x07, 0x04, broadcast, DataFieldSet::getIdentFields(), !broadcast); return new Message("scan", "", "", 0x07, 0x04, broadcast, DataFieldSet::getIdentFields(), deleteData);
} }
bool Message::extractFieldNames(const string& str, bool checkAbbreviated, vector<string>* fields) { bool Message::extractFieldNames(const string& str, bool checkAbbreviated, vector<string>* fields) {
src/lib/ebus/message.h
+4 -4
View File
@@ -197,7 +197,7 @@ class Message : public AttributedItem {
* @param broadcast true for broadcast scan message, false for scan message to be sent to a slave address. * @param broadcast true for broadcast scan message, false for scan message to be sent to a slave address.
* @return the new scan @a Message instance. * @return the new scan @a Message instance.
*/ */
static Message* createScanMessage(bool broadcast = false); static Message* createScanMessage(bool broadcast = false, bool deleteData = true);
/** /**
* Extract the known field names from the input string. * Extract the known field names from the input string.
@@ -1218,12 +1218,12 @@ class MessageMap : public MappedFileReader {
* @param addAll whether to add all messages, even if duplicate. * @param addAll whether to add all messages, even if duplicate.
* @param preferLanguage the preferred language to use, or empty. * @param preferLanguage the preferred language to use, or empty.
*/ */
explicit MessageMap(bool addAll = false, const string& preferLanguage = "") explicit MessageMap(bool addAll = false, const string& preferLanguage = "", bool deleteData = true)
: MappedFileReader::MappedFileReader(true), : MappedFileReader::MappedFileReader(true),
m_addAll(addAll), m_additionalScanMessages(false), m_maxIdLength(0), m_maxBroadcastIdLength(0), m_addAll(addAll), m_additionalScanMessages(false), m_maxIdLength(0), m_maxBroadcastIdLength(0),
m_messageCount(0), m_conditionalMessageCount(0), m_passiveMessageCount(0) { m_messageCount(0), m_conditionalMessageCount(0), m_passiveMessageCount(0) {
m_scanMessage = Message::createScanMessage(); m_scanMessage = Message::createScanMessage(false, deleteData);
m_broadcastScanMessage = Message::createScanMessage(true); m_broadcastScanMessage = Message::createScanMessage(true, false);
} }
/** /**