espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-04 08:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[coap] return error if CoAP header exceeds message length (#3462)

Browse Source
This commit is contained in:
Jonathan Hui
2019-01-16 05:57:02 -08:00
committed by GitHub
parent 57a0fda5da
commit 28582ef038
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/coap/coap_message.cpp
+9 -3
View File
@@ -199,11 +199,15 @@ const otCoapOption *Message::GetFirstOption(void)
const otCoapOption *option = NULL;
memset(&GetHelpData().mOption, 0, sizeof(GetHelpData().mOption));
VerifyOrExit(GetLength() - GetHelpData().mHeaderOffset >= GetOptionStart());
GetHelpData().mNextOptionOffset = GetHelpData().mHeaderOffset + GetOptionStart();
VerifyOrExit(GetLength() - GetHelpData().mHeaderOffset > GetOptionStart());
option = GetNextOption();
if (GetHelpData().mNextOptionOffset < GetLength())
{
option = GetNextOption();
}
exit:
return option;
@@ -316,6 +320,8 @@ otError Message::ParseHeader(void)
assert(mBuffer.mHead.mData + mBuffer.mHead.mInfo.mReserved >=
reinterpret_cast<uint8_t *>(&GetHelpData()) + sizeof(GetHelpData()));
memset(&GetHelpData(), 0, sizeof(GetHelpData()));
GetHelpData().mHeaderOffset = GetOffset();
Read(GetHelpData().mHeaderOffset, sizeof(GetHelpData().mHeader), &GetHelpData().mHeader);