DUNE/IMC/IridiumMessageDefinitions: fix segmentation faul on produce call with invalid message id..

xBogas · web-flow · commit 6f036a573bb9 · 2026-03-30T17:08:50.000+01:00
diff --git a/src/DUNE/IMC/IridiumMessageDefinitions.cpp b/src/DUNE/IMC/IridiumMessageDefinitions.cpp
@@ -138,14 +138,14 @@ namespace DUNE
       buffer += DUNE::IMC::deserialize(mgid, buffer, length);
       buffer += DUNE::IMC::deserialize(timestamp, buffer, length);
       msg = DUNE::IMC::Factory::produce(mgid);
-      msg->setTimeStamp(timestamp);
 
       if (msg == NULL)
       {
         std::cerr << "[IridiumMessage::deserialize]:ERROR parsing Iridium message: unknown msg id: " << mgid << std::endl;
         return 0;
       }
 
+      msg->setTimeStamp(timestamp);
       buffer += msg->deserializeFields(buffer, length);
 
       return buffer - start;

Original file line number	Diff line number	Diff line change
`@@ -138,14 +138,14 @@ namespace DUNE`
`138`	`138`	`buffer += DUNE::IMC::deserialize(mgid, buffer, length);`
`139`	`139`	`buffer += DUNE::IMC::deserialize(timestamp, buffer, length);`
`140`	`140`	`msg = DUNE::IMC::Factory::produce(mgid);`
`141`		`- msg->setTimeStamp(timestamp);`
`142`	`141`
`143`	`142`	`if (msg == NULL)`
`144`	`143`	`{`
`145`	`144`	`std::cerr << "[IridiumMessage::deserialize]:ERROR parsing Iridium message: unknown msg id: " << mgid << std::endl;`
`146`	`145`	`return 0;`
`147`	`146`	`}`
`148`	`147`
	`148`	`+ msg->setTimeStamp(timestamp);`
`149`	`149`	`buffer += msg->deserializeFields(buffer, length);`
`150`	`150`
`151`	`151`	`return buffer - start;`