Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] WireDecodeBinary: Fix some mpack paths (#8738)

Browse Source
This commit is contained in:
Peter Johnson
2026-04-10 12:28:17 -07:00
committed by GitHub
parent 7e86c10a28
commit b7fe3dad46
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ntcore/src/main/native/cpp/net/WireDecoder.cpp
View File

@@ -581,9 +581,12 @@ bool wpi::nt::net::WireDecodeBinary(std::span<const uint8_t>* in, int* outId,
} }
default: default:
*error = fmt::format("unrecognized type {}", type); *error = fmt::format("unrecognized type {}", type);
mpack_done_array(&reader);
mpack_reader_destroy(&reader);
return false; return false;
} }
mpack_done_array(&reader); mpack_done_array(&reader);
auto remaining = mpack_reader_remaining(&reader, nullptr);
auto err = mpack_reader_destroy(&reader); auto err = mpack_reader_destroy(&reader);
if (err != mpack_ok) { if (err != mpack_ok) {
*error = mpack_error_to_string(err); *error = mpack_error_to_string(err);
@@ -593,6 +596,6 @@ bool wpi::nt::net::WireDecodeBinary(std::span<const uint8_t>* in, int* outId,
outValue->SetServerTime(time); outValue->SetServerTime(time);
outValue->SetTime(time == 0 ? 0 : time + localTimeOffset); outValue->SetTime(time == 0 ? 0 : time + localTimeOffset);
// update input range // update input range
*in = wpi::util::take_back(*in, mpack_reader_remaining(&reader, nullptr)); *in = wpi::util::take_back(*in, remaining);
return true; return true;
} }