Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-29 03:36:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

replay: fix replay msg ids larger than 128 (#20865)

Browse Source
This commit is contained in:
David Jablonski
2023-01-11 15:13:53 +01:00
committed by GitHub
parent bc9abf8c36
commit c6239ce8c2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/replay/Replay.cpp
+4 -4
View File
@@ -371,9 +371,9 @@ bool
Replay::readAndAddSubscription(std::ifstream &file, uint16_t msg_size) Replay::readAndAddSubscription(std::ifstream &file, uint16_t msg_size)
{ {
_read_buffer.reserve(msg_size + 1); _read_buffer.reserve(msg_size + 1);
char *message = (char *)_read_buffer.data(); uint8_t *message = _read_buffer.data();
streampos this_message_pos = file.tellg() - (streamoff)ULOG_MSG_HEADER_LEN; streampos this_message_pos = file.tellg() - (streamoff)ULOG_MSG_HEADER_LEN;
file.read(message, msg_size); file.read((char *)message, msg_size);
message[msg_size] = 0; message[msg_size] = 0;
if (!file) { if (!file) {
@@ -387,8 +387,8 @@ Replay::readAndAddSubscription(std::ifstream &file, uint16_t msg_size)
_subscription_file_pos = file.tellg(); _subscription_file_pos = file.tellg();
uint8_t multi_id = *(uint8_t *)message; uint8_t multi_id = *(uint8_t *)message;
uint16_t msg_id = ((uint16_t) message[1]) | (((uint16_t) message[2]) << 8); uint16_t msg_id = ((uint16_t)message[1]) | (((uint16_t)message[2]) << 8);
string topic_name(message + 3); string topic_name((char *)message + 3);
const orb_metadata *orb_meta = findTopic(topic_name); const orb_metadata *orb_meta = findTopic(topic_name);
if (!orb_meta) { if (!orb_meta) {