Skip to content

DELIA-67277: Use the updated msg_unpack_next() for handling webconfig data #74

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
bpunnuru merged 3 commits into from
Feb 24, 2025
Merged

DELIA-67277: Use the updated msg_unpack_next() for handling webconfig data #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a79f20
Update rrdMsgPackDecoder.c
AravindanNC Feb 24, 2025
15ada83
Update rrdUnitTestRunner.cpp
AravindanNC Feb 24, 2025
b4e0fd3
Merge pull request #76 from rdkcentral/develop
AravindanNC Feb 24, 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
9 changes: 4 additions & 5 deletions src/rrdMsgPackDecoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,14 @@ void *helper_convert(const void *buf, size_t len,
msgpack_unpack_return get_msgpack_unpack_status(char *decodedbuf, int size)
{

msgpack_zone mempool;
msgpack_object deserialized;
msgpack_unpacked deserialized;
msgpack_unpacked_init(&deserialized);
msgpack_unpack_return unpack_ret;

if (decodedbuf == NULL || !size)
return MSGPACK_UNPACK_NOMEM_ERROR;

msgpack_zone_init(&mempool, 2048);
unpack_ret = msgpack_unpack(decodedbuf, size, NULL, &mempool, &deserialized);
unpack_ret = msgpack_unpack_next(&deserialized, decodedbuf, size, NULL);

switch(unpack_ret)
{
Expand All @@ -206,7 +205,7 @@ msgpack_unpack_return get_msgpack_unpack_status(char *decodedbuf, int size)
RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Message Pack decode failed with error\n", __FUNCTION__, __LINE__);
}

msgpack_zone_destroy(&mempool);
msgpack_unpacked_destroy( &deserialized );
// End of msgpack decoding

return unpack_ret;
Expand Down
3 changes: 2 additions & 1 deletion src/unittest/rrdUnitTestRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2951,7 +2951,8 @@ TEST(GetMsgpackUnpackStatusTest, MsgpackUnpackReturnsExtraBytes)
msgpack_pack_int(&pk, 1);
sbuf.data[sbuf.size] = '\0'; // Add an extra byte

EXPECT_EQ(get_msgpack_unpack_status(sbuf.data, sbuf.size + 1), MSGPACK_UNPACK_EXTRA_BYTES);
// msg_unpack_next() internally handles EXTRABYTES. It should return SUCCESS.
EXPECT_EQ(get_msgpack_unpack_status(sbuf.data, sbuf.size + 1), MSGPACK_UNPACK_SUCCESS);

msgpack_sbuffer_destroy(&sbuf);
}
Expand Down