topic_transport: receiver/depacketizer: prune before accessing the list

xqms · xqms · commit db0d63c4f66f · 2021-08-13T12:39:18.000+02:00
This could potentially trigger a segfault when all messages are older than 5s. Maybe related: #17
diff --git a/nimbro_topic_transport/src/receiver/depacketizer.cpp b/nimbro_topic_transport/src/receiver/depacketizer.cpp
@@ -35,10 +35,10 @@ void Depacketizer::addPacket(const Packet::Ptr& packet)
 
 	if(it == m_messageBuffer.end())
 	{
+		pruneMessages();
+
 		m_messageBuffer.push_front(PartialMessage(msg_id));
 		it = m_messageBuffer.begin();
-
-		pruneMessages();
 	}
 
 	handleMessagePacket(it, packet);

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ void Depacketizer::addPacket(const Packet::Ptr& packet)`
`35`	`35`
`36`	`36`	`if(it == m_messageBuffer.end())`
`37`	`37`	`{`
	`38`	`+ pruneMessages();`
	`39`	`+`
`38`	`40`	`m_messageBuffer.push_front(PartialMessage(msg_id));`
`39`	`41`	`it = m_messageBuffer.begin();`
`40`		`-`
`41`		`- pruneMessages();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`handleMessagePacket(it, packet);`