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

Jump to bottom

fix MQTTDeserialize_unsubscribe didn't judge maxcount or may cause memory access violation #259

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix MQTTDeserialize_unsubscribe didn't judge maxcount or may cause memory access violation #259

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
452d6fa
fix MQTTDeserialize_unsubscribe didn't judge maxcount
Mar 2, 2024
7ac91eb
change comparison
Mar 5, 2024
d2b9d62
add test for invalid unsubscribe packet
Mar 6, 2024
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 MQTTPacket/src/MQTTUnsubscribeServer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ int32_t MQTTDeserialize_unsubscribe(unsigned char* dup, unsigned short* packetid
*count = 0;
while (curdata < enddata)
{
if (*count >= maxcount) {
rc = 0;
goto exit;
}
if (!readMQTTLenString(&topicFilters[*count], &curdata, enddata))
goto exit;
(*count)++;
Expand Down
9 changes: 9 additions & 0 deletions MQTTPacket/test/test1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,15 @@ int test5(struct Options options)
for (i = 0; i < count2; ++i)
assert("topics should be the same",
checkMQTTStrings(topicStrings[i], topicStrings2[i]), "topics were different %s\n", "");

unsigned char dup3 ;
unsigned short msgid3 ;
int count3 = 0;
unsigned char invalid_buf[49] = {173,47,1,0,0,1,0,0,0,0,0,0,12,105,111,116,45,48,52,48,97,48,49,107,112,4,109,113,116,116,6,105,111,116,104,117,98,8,97,108,105,121,117,110,99,115,3,99,111};
int invalid_buf_len = sizeof(invalid_buf);
MQTTString topicStrings3[1] = {MQTTString_initializer};
rc = MQTTDeserialize_unsubscribe(&dup3, &msgid3, 1, &count3, topicStrings3, invalid_buf, invalid_buf_len);
assert("bad rc from deserialize unsubscribe invalid packet",rc == 0,"rc was %d\n",rc);

/* exit: */
MyLog(LOGA_INFO, "TEST5: test %s. %d tests run, %d failures.",
Expand Down