t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add checks to ensure that references to nonexistant nodes are handled

Browse Source
This commit is contained in:
Collin Kidder
2018-07-24 21:35:42 -04:00
parent 2c8e9716a6
commit 6ee5a7f7d7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbchandler.cpp
+5 -1
View File
@@ -347,6 +347,7 @@ DBC_MESSAGE* DBCFile::parseMessageLine(QString line)
msg.name = match.captured(2); msg.name = match.captured(2);
msg.len = match.captured(3).toInt(); msg.len = match.captured(3).toInt();
msg.sender = findNodeByName(match.captured(4)); msg.sender = findNodeByName(match.captured(4));
if (!msg.sender) msg.sender = findNodeByIdx(0);
messageHandler->addMessage(msg); messageHandler->addMessage(msg);
msgPtr = messageHandler->findMsgByID(msg.ID); msgPtr = messageHandler->findMsgByID(msg.ID);
} }
@@ -450,9 +451,12 @@ DBC_SIGNAL* DBCFile::parseSignalLine(QString line, DBC_MESSAGE *msg)
if (match.captured(11 + offset).contains(',')) if (match.captured(11 + offset).contains(','))
{ {
QString tmp = match.captured(11 + offset).split(',')[0]; QString tmp = match.captured(11 + offset).split(',')[0];
sig.receiver = findNodeByName(tmp); sig.receiver = findNodeByName(tmp);
} }
else sig.receiver = findNodeByName(match.captured(11 + offset)); else sig.receiver = findNodeByName(match.captured(11 + offset));
if (!sig.receiver) sig.receiver = findNodeByIdx(0); //apply default if there was no match
sig.parentMessage = msg; sig.parentMessage = msg;
msg->sigHandler->addSignal(sig); msg->sigHandler->addSignal(sig);
if (isMultiplexor) msg->multiplexorSignal = msg->sigHandler->findSignalByName(sig.name); if (isMultiplexor) msg->multiplexorSignal = msg->sigHandler->findSignalByName(sig.name);