Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

Do not try to allocate memory on de-serialization when there is no need #493

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not try to allocate memory on de-serialization when there is no need #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions src/lib/support/SerializationUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,18 +877,23 @@ WEAVE_ERROR ReadDataForType(TLVReader &aReader, void *aStructureData, const Fiel

case SerializedFieldTypeUTF8String:
{
char *dst = NULL;
// TLV Strings are not null terminated
uint32_t length = aReader.GetLength() + 1;

dst = (char *)memMgmt->mem_alloc(length);
VerifyOrExit(dst != NULL, err = WEAVE_ERROR_NO_MEMORY);
if (length > 1)
{
char *dst = NULL;

err = aReader.GetString(dst, length);
SuccessOrExit(err);
dst = (char *)memMgmt->mem_alloc(length);
VerifyOrExit(dst != NULL, err = WEAVE_ERROR_NO_MEMORY);

err = aReader.GetString(dst, length);
SuccessOrExit(err);

LogReadWrite("%s utf8string '%s' allocating %d bytes at %p", "R", dst, length, dst);

LogReadWrite("%s utf8string '%s' allocating %d bytes at %p", "R", dst, length, dst);
*static_cast<char**>(aStructureData) = dst;
*static_cast<char**>(aStructureData) = dst;
}
break;
}

Expand All @@ -898,7 +903,8 @@ WEAVE_ERROR ReadDataForType(TLVReader &aReader, void *aStructureData, const Fiel
byteString.mLen = aReader.GetLength();

byteString.mBuf = static_cast<uint8_t *>(memMgmt->mem_alloc(byteString.mLen));
VerifyOrExit(byteString.mBuf != NULL, err = WEAVE_ERROR_NO_MEMORY);
if (byteString.mLen > 0)
VerifyOrExit(byteString.mBuf != NULL, err = WEAVE_ERROR_NO_MEMORY);
aReader.GetBytes(byteString.mBuf, byteString.mLen);

LogReadWrite("%s bytestring allocated %d bytes at %p", "R", byteString.mLen, byteString.mBuf);
Expand Down