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

[operational-dataset] add length check when reading network name (#2226)

Browse Source
This commit is contained in:
Jonathan Hui
2017-10-02 21:51:39 -07:00
committed by GitHub
parent 44cb528a7a
commit b2e889b5d4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_local.cpp
+9 -2
View File
@@ -195,8 +195,15 @@ otError DatasetLocal::Get(otOperationalDataset &aDataset) const
case Tlv::kNetworkName: case Tlv::kNetworkName:
{ {
const NetworkNameTlv *tlv = static_cast<const NetworkNameTlv *>(cur); const NetworkNameTlv *tlv = static_cast<const NetworkNameTlv *>(cur);
memcpy(aDataset.mNetworkName.m8, tlv->GetNetworkName(), tlv->GetLength()); uint8_t length = tlv->GetLength();
aDataset.mNetworkName.m8[tlv->GetLength()] = '\0';
if (length > sizeof(aDataset.mNetworkName) - 1)
{
length = sizeof(aDataset.mNetworkName) - 1;
}
memcpy(aDataset.mNetworkName.m8, tlv->GetNetworkName(), length);
aDataset.mNetworkName.m8[length] = '\0';
aDataset.mIsNetworkNameSet = true; aDataset.mIsNetworkNameSet = true;
break; break;
} }