Skip to content

check port id range #251

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

Merged
pavel-kirienko merged 6 commits into from
Aug 12, 2025
Merged

check port id range #251

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86182fe
merge with master
songmeo Aug 11, 2025
6cad1e9
assign port_id_minimum to a value
songmeo Aug 11, 2025
4ec5685
fix the logic part
songmeo Aug 11, 2025
e7dd3a5
add port id check test
songmeo Aug 12, 2025
a48f9bb
fix sonar errors
songmeo Aug 12, 2025
3d9e647
add bool port_id_ok
songmeo Aug 12, 2025
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
6 changes: 5 additions & 1 deletion libcanard/canard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ typedef uint16_t TransferCRC;
#define CRC_INITIAL 0xFFFFU
#define CRC_RESIDUE 0x0000U
#define CRC_SIZE_BYTES 2U
#define PORT_ID_MINIMUM 49152
Copy link
Copy Markdown
Member

@pavel-kirienko pavel-kirienko Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this for?


#if (CANARD_CRC_TABLE != 0)
static const uint16_t CRCTable[256] = {
Expand Down Expand Up @@ -1384,7 +1385,10 @@ int8_t canardRxSubscribe(struct CanardInstance* const ins,
{
int8_t out = -CANARD_ERROR_INVALID_ARGUMENT;
const size_t tk = (size_t) transfer_kind;
if ((ins != NULL) && (out_subscription != NULL) && (tk < CANARD_NUM_TRANSFER_KINDS))

if ((ins != NULL) && (out_subscription != NULL) && (tk < CANARD_NUM_TRANSFER_KINDS) &&
(((transfer_kind == CanardTransferKindMessage) && (port_id <= CANARD_SUBJECT_ID_MAX)) ||
(port_id <= CANARD_SERVICE_ID_MAX)))
Copy link
Copy Markdown
Member

@pavel-kirienko pavel-kirienko Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please extract these into a port_id_ok variable to enhance readability, and remove the extra blank line.

{
// Reset to the initial state. This is absolutely critical because the new payload size limit may be larger
// than the old value; if there are any payload buffers allocated, we may overrun them because they are shorter
Expand Down
4 changes: 4 additions & 0 deletions tests/test_public_rx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ TEST_CASE("RxSubscriptionErrors")
REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT == canardRxSubscribe(&ins.getInstance(), kind.value, 0, 0, 0, &sub));
REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT ==
canardRxSubscribe(&ins.getInstance(), CanardTransferKindMessage, 0, 0, 0, nullptr));
REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT ==
canardRxSubscribe(&ins.getInstance(), CanardTransferKindMessage, 8192, 0, 0, &sub));
REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT ==
canardRxSubscribe(&ins.getInstance(), CanardTransferKindResponse, 512, 0, 0, &sub));

REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT == canardRxUnsubscribe(nullptr, CanardTransferKindMessage, 0));
REQUIRE(-CANARD_ERROR_INVALID_ARGUMENT == canardRxUnsubscribe(&ins.getInstance(), kind.value, 0));
Expand Down