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

fix for sigsegv when resolving conditions introduced by 611cb56

Browse Source
This commit is contained in:
john30
2017-04-26 09:33:39 +02:00
parent aa5062999a
commit cce36d93f5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+7 -9
View File
@@ -1963,7 +1963,7 @@ result_t MessageMap::readConditions(string& types, const string filename, string
if (types.length() > 0 && types[0] == '[' && (pos=types.find_last_of(']')) != string::npos) { if (types.length() > 0 && types[0] == '[' && (pos=types.find_last_of(']')) != string::npos) {
// check if combined or simple condition is already known // check if combined or simple condition is already known
const string combinedkey = filename+":"+types.substr(1, pos-1); const string combinedkey = filename+":"+types.substr(1, pos-1);
const auto it = m_conditions.find(combinedkey); auto it = m_conditions.find(combinedkey);
if (it != m_conditions.end()) { if (it != m_conditions.end()) {
condition = it->second; condition = it->second;
types = types.substr(pos+1); types = types.substr(pos+1);
@@ -1973,7 +1973,7 @@ result_t MessageMap::readConditions(string& types, const string filename, string
while ((pos=types.find(']')) != string::npos) { while ((pos=types.find(']')) != string::npos) {
// simple condition // simple condition
string key = filename+":"+types.substr(1, pos-1); string key = filename+":"+types.substr(1, pos-1);
auto it = m_conditions.find(key); it = m_conditions.find(key);
Condition* add = NULL; Condition* add = NULL;
if (it == m_conditions.end()) { if (it == m_conditions.end()) {
// check for on-the-fly condition // check for on-the-fly condition
@@ -2135,11 +2135,9 @@ result_t MessageMap::addFromFile(map<string, string>& row, vector< map<string, s
errorDescription = "invalid instruction"; errorDescription = "invalid instruction";
return result; return result;
} }
const auto it = m_instructions.find(filename); auto it = m_instructions.find(filename);
if (it == m_instructions.end()) { if (it == m_instructions.end()) {
vector<Instruction*> instructions; m_instructions[filename].push_back(instruction);
instructions.push_back(instruction);
m_instructions[filename] = instructions;
} else { } else {
it->second.push_back(instruction); it->second.push_back(instruction);
} }
@@ -2204,7 +2202,7 @@ Message* MessageMap::getScanMessage(const symbol_t dstAddress) {
result_t MessageMap::resolveConditions(string& errorDescription, bool verbose) { result_t MessageMap::resolveConditions(string& errorDescription, bool verbose) {
result_t overallResult = RESULT_OK; result_t overallResult = RESULT_OK;
for (const auto it : m_conditions) { for (const auto& it : m_conditions) {
Condition* condition = it.second; Condition* condition = it.second;
result_t result = resolveCondition(condition, errorDescription); result_t result = resolveCondition(condition, errorDescription);
if (result != RESULT_OK) { if (result != RESULT_OK) {
@@ -2233,8 +2231,8 @@ result_t MessageMap::resolveCondition(Condition* condition, string& errorDescrip
result_t MessageMap::executeInstructions(ostringstream& log, void (*readMessageFunc)(Message* message)) { result_t MessageMap::executeInstructions(ostringstream& log, void (*readMessageFunc)(Message* message)) {
result_t overallResult = RESULT_OK; result_t overallResult = RESULT_OK;
vector<string> remove; vector<string> remove;
for (auto it : m_instructions) { for (auto& it : m_instructions) {
auto& instructions = it.second; auto instructions = it.second;
bool removeSingletons = false; bool removeSingletons = false;
vector<Instruction*> remain; vector<Instruction*> remain;
for (const auto instruction : instructions) { for (const auto instruction : instructions) {