Add checks to ensure that references to nonexistant nodes are handled

2018-07-24 21:35:42 -04:00
parent 2c8e9716a6
commit 6ee5a7f7d7
1 changed files with 5 additions and 1 deletions
@@ -347,6 +347,7 @@ DBC_MESSAGE* DBCFile::parseMessageLine(QString line)
        msg.name = match.captured(2);
        msg.len = match.captured(3).toInt();
        msg.sender = findNodeByName(match.captured(4));
+        if (!msg.sender) msg.sender = findNodeByIdx(0);
        messageHandler->addMessage(msg);
        msgPtr = messageHandler->findMsgByID(msg.ID);
    }
@@ -453,6 +454,9 @@ DBC_SIGNAL* DBCFile::parseSignalLine(QString line, DBC_MESSAGE *msg)
            sig.receiver = findNodeByName(tmp);            
        }
        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;
        msg->sigHandler->addSignal(sig);
        if (isMultiplexor) msg->multiplexorSignal = msg->sigHandler->findSignalByName(sig.name);