maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change parameter type of pack_dci_payload and unpack_dci_payload to avoid -Wstringop-overflow warning.

Browse Source 
Change declaration of unpack_buf in dci_inversion_test to not require calloc
This commit is contained in:
Rúben Soares Silva
2024-06-25 11:53:41 +01:00
parent d35dbe6377
commit 6fc8eb0fee
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nfapi/open-nFAPI/common/public_inc/nfapi.h
+2 -2
View File
@@ -77,8 +77,8 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg,
uint8_t *end, uint8_t *end,
unpack_array_elem_fn fn); unpack_array_elem_fn fn);
uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **out, uint8_t *end); uint32_t pack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **out, uint8_t *end);
uint32_t unpack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **in, uint8_t *end); uint32_t unpack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **in, uint8_t *end);
uint8_t pack_tl(nfapi_tl_t *tl, uint8_t **ppWritePackedMsg, uint8_t *end); uint8_t pack_tl(nfapi_tl_t *tl, uint8_t **ppWritePackedMsg, uint8_t *end);
uint8_t unpack_tl(uint8_t **ppReadPackedMsg, nfapi_tl_t *tl, uint8_t *end); uint8_t unpack_tl(uint8_t **ppReadPackedMsg, nfapi_tl_t *tl, uint8_t *end);
nfapi/open-nFAPI/common/src/nfapi.c
+2 -2
View File
@@ -618,7 +618,7 @@ uint8_t unpackarray(uint8_t **ppReadPackedMsg,
return 1; return 1;
} }
uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **out, uint8_t *end) uint32_t pack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **out, uint8_t *end)
{ {
uint8_t dci_byte_len = (payloadSizeBits + 7) / 8; uint8_t dci_byte_len = (payloadSizeBits + 7) / 8;
#ifdef FAPI_BYTE_ORDERING_BIG_ENDIAN #ifdef FAPI_BYTE_ORDERING_BIG_ENDIAN
@@ -648,7 +648,7 @@ uint32_t pack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t *
#endif #endif
} }
uint32_t unpack_dci_payload(uint8_t payload[], uint16_t payloadSizeBits, uint8_t **in, uint8_t *end) uint32_t unpack_dci_payload(uint8_t *payload, uint16_t payloadSizeBits, uint8_t **in, uint8_t *end)
{ {
// Pull the inverted DCI and invert it back // Pull the inverted DCI and invert it back
// Helper vars for DCI Payload // Helper vars for DCI Payload
nfapi/tests/p7/nr_fapi_dci_inversion_test.c
+1 -2
View File
@@ -108,7 +108,7 @@ void test_pack_payload(uint8_t payloadSizeBits, uint8_t payload[])
pack_dci_payload(payload, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd); pack_dci_payload(payload, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd);
uint8_t *unpack_buf = calloc_or_fail(payloadSizeBytes, sizeof(uint8_t)); uint8_t unpack_buf[payloadSizeBytes];
pWritePackedMessage = msg_buf; pWritePackedMessage = msg_buf;
unpack_dci_payload(unpack_buf, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd); unpack_dci_payload(unpack_buf, payloadSizeBits, &pWritePackedMessage, pPackMessageEnd);
@@ -128,7 +128,6 @@ void test_pack_payload(uint8_t payloadSizeBits, uint8_t payload[])
DevAssert(memcmp(payload, unpack_buf, payloadSizeBytes) == 0); DevAssert(memcmp(payload, unpack_buf, payloadSizeBytes) == 0);
// All tests successful! // All tests successful!
free(unpack_buf);
} }
int main(int n, char *v[]) int main(int n, char *v[])