Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In FprimeProtocol.cpp:deframe(), make buffer no larger than requested… #822

Merged
merged 1 commit into from
Jul 14, 2021
Merged

In FprimeProtocol.cpp:deframe(), make buffer no larger than requested… #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Svc/FramingProtocol/FprimeProtocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ DeframingProtocol::DeframingStatus FprimeDeframing::deframe(Types::CircularBuffe
return DeframingProtocol::DEFRAMING_INVALID_CHECKSUM;
}
Fw::Buffer buffer = m_interface->allocate(size);
// some allocators may return buffers larger than requested
// that causes issues in routing. adjust size
FW_ASSERT(buffer.getSize() >= size);
buffer.setSize(size);
ring.peek(buffer.getData(), size, FP_FRAME_HEADER_SIZE);
m_interface->route(buffer);
return DeframingProtocol::DEFRAMING_STATUS_SUCCESS;
Expand Down