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

Added a few null checks for NewWithAvailableSize #3123

Merged
merged 3 commits into from
Oct 8, 2020
Merged

Added a few null checks for NewWithAvailableSize #3123

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb4628
Added a few null checks for NewWithAvailableSize
andy31415 Oct 7, 2020
2367cd1
Fix typo
andy31415 Oct 7, 2020
290526c
Added scoped lock construct for jni
andy31415 Oct 8, 2020
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: 8 additions & 1 deletion examples/chip-tool/commands/common/ModelCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,14 @@ void ModelCommand::SendCommand(ChipDeviceController * dc)
// Make sure our buffer is big enough, but this will need a better setup!
static const size_t bufferSize = 1024;
auto * buffer = PacketBuffer::NewWithAvailableSize(bufferSize);
uint16_t dataLength = EncodeCommand(buffer, bufferSize, mEndPointId);

if (buffer == nullptr)
{
ChipLogError(chipTool, "Failed to allocate memory for packet data.");
return;
}

uint16_t dataLength = EncodeCommand(buffer, bufferSize, mEndPointId);
buffer->SetDataLength(dataLength);
ChipLogProgress(chipTool, "Encoded data of length %d", dataLength);

Expand Down
64 changes: 40 additions & 24 deletions src/controller/java/CHIPDeviceController-JNI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,16 @@ JNI_METHOD(void, beginSendMessage)(JNIEnv * env, jobject self, jlong deviceContr
pthread_mutex_lock(&sStackLock);

auto * buffer = System::PacketBuffer::NewWithAvailableSize(messageLen);
memcpy(buffer->Start(), messageStr, messageLen);
buffer->SetDataLength(messageLen);
err = deviceController->SendMessage((void *) "SendMessage", buffer);
if (buffer == nullptr)
{
err = CHIP_ERROR_NO_MEMORY;
}
else
{
memcpy(buffer->Start(), messageStr, messageLen);
buffer->SetDataLength(messageLen);
err = deviceController->SendMessage((void *) "SendMessage", buffer);
}

pthread_mutex_unlock(&sStackLock);

Expand Down Expand Up @@ -331,32 +338,41 @@ JNI_METHOD(void, beginSendCommand)(JNIEnv * env, jobject self, jlong deviceContr
static const size_t bufferSize = 1024;
auto * buffer = System::PacketBuffer::NewWithAvailableSize(bufferSize);

// Hardcode endpoint to 1 for now
uint8_t endpoint = 1;

uint16_t dataLength = 0;
switch (commandID)
if (buffer == nullptr)
{
case 0:
dataLength = encodeOffCommand(buffer->Start(), bufferSize, endpoint);
break;
case 1:
dataLength = encodeOnCommand(buffer->Start(), bufferSize, endpoint);
break;
case 2:
dataLength = encodeToggleCommand(buffer->Start(), bufferSize, endpoint);
break;
default:
ChipLogError(Controller, "Unknown command: %d", commandID);
return;
err = CHIP_ERROR_NO_MEMORY;
pthread_mutex_unlock(&sStackLock);
}
else
{

// Hardcode endpoint to 1 for now
uint8_t endpoint = 1;

uint16_t dataLength = 0;
switch (commandID)
{
case 0:
dataLength = encodeOffCommand(buffer->Start(), bufferSize, endpoint);
break;
case 1:
dataLength = encodeOnCommand(buffer->Start(), bufferSize, endpoint);
break;
case 2:
dataLength = encodeToggleCommand(buffer->Start(), bufferSize, endpoint);
break;
default:
ChipLogError(Controller, "Unknown command: %d", commandID);
return;
}

buffer->SetDataLength(dataLength);
buffer->SetDataLength(dataLength);

// Hardcode endpoint to 1 for now
err = deviceController->SendMessage((void *) "SendMessage", buffer);
// Hardcode endpoint to 1 for now
err = deviceController->SendMessage((void *) "SendMessage", buffer);

pthread_mutex_unlock(&sStackLock);
pthread_mutex_unlock(&sStackLock);
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
}

if (err != CHIP_NO_ERROR)
{
Expand Down
21 changes: 14 additions & 7 deletions src/darwin/Framework/CHIP/CHIPDeviceController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,14 @@ - (BOOL)sendMessage:(NSData *)message error:(NSError * __autoreleasing *)error
const void * messageChars = [message bytes];

chip::System::PacketBuffer * buffer = chip::System::PacketBuffer::NewWithAvailableSize(messageLen);
buffer->SetDataLength(messageLen);
if (!buffer) {
err = CHIP_ERROR_NO_MEMORY;
} else {
buffer->SetDataLength(messageLen);

memcpy(buffer->Start(), messageChars, messageLen);
err = self.cppController->SendMessage((__bridge void *) self, buffer);
memcpy(buffer->Start(), messageChars, messageLen);
err = self.cppController->SendMessage((__bridge void *) self, buffer);
}
[self.lock unlock];

if (err != CHIP_NO_ERROR) {
Expand All @@ -312,11 +316,14 @@ - (BOOL)sendCHIPCommand:(uint32_t (^)(chip::System::PacketBuffer *, uint16_t))en
// FIXME: This needs a better buffersizing setup!
static const size_t bufferSize = 1024;
chip::System::PacketBuffer * buffer = chip::System::PacketBuffer::NewWithAvailableSize(bufferSize);
if (!buffer) {
err = CHIP_ERROR_NO_MEMORY;
} else {
uint32_t dataLength = encodeCommandBlock(buffer, (uint16_t) bufferSize);
buffer->SetDataLength(dataLength);

uint32_t dataLength = encodeCommandBlock(buffer, (uint16_t) bufferSize);
buffer->SetDataLength(dataLength);

err = self.cppController->SendMessage((__bridge void *) self, buffer);
err = self.cppController->SendMessage((__bridge void *) self, buffer);
}
[self.lock unlock];
if (err != CHIP_NO_ERROR) {
CHIP_LOG_ERROR("Error(%d): %@, send failed", err, [CHIPError errorForCHIPErrorCode:err]);
Expand Down
2 changes: 2 additions & 0 deletions src/transport/RendezvousSession.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ CHIP_ERROR RendezvousSession::HandleSecureMessage(PacketBuffer * msgBuf)
allocated as an inline buffer to PacketBuffer structure */
origMsg = msgBuf;
msgBuf = PacketBuffer::NewWithAvailableSize(len);
VerifyOrExit(msgBuf != nullptr, err = CHIP_ERROR_NO_MEMORY);

msgBuf->SetDataLength(len, msgBuf);
#endif
plainText = msgBuf->Start();
Expand Down
1 change: 1 addition & 0 deletions src/transport/SecureSessionMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ void SecureSessionMgrBase::HandleDataReceived(const PacketHeader & packetHeader,
allocated as an inline buffer to PacketBuffer structure */
origMsg = msg;
msg = PacketBuffer::NewWithAvailableSize(len);
VerifyOrExit(msg != nullptr, ChipLogError(Inet, "Insufficient memory for packet buffer."));
msg->SetDataLength(len, msg);
#endif
plainText = msg->Start();
Expand Down
2 changes: 2 additions & 0 deletions src/transport/raw/tests/TestTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ void CheckMessageTest(nlTestSuite * inSuite, void * inContext, const IPAddress &
uint16_t payload_len = sizeof(PAYLOAD);

chip::System::PacketBuffer * buffer = chip::System::PacketBuffer::NewWithAvailableSize(payload_len);
NL_TEST_ASSERT(inSuite, buffer != nullptr);

memmove(buffer->Start(), PAYLOAD, payload_len);
buffer->SetDataLength(payload_len);

Expand Down
2 changes: 2 additions & 0 deletions src/transport/raw/tests/TestUDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ void CheckMessageTest(nlTestSuite * inSuite, void * inContext, const IPAddress &
uint16_t payload_len = sizeof(PAYLOAD);

chip::System::PacketBuffer * buffer = chip::System::PacketBuffer::NewWithAvailableSize(payload_len);
NL_TEST_ASSERT(inSuite, buffer != nullptr);

memmove(buffer->Start(), PAYLOAD, payload_len);
buffer->SetDataLength(payload_len);

Expand Down
2 changes: 2 additions & 0 deletions src/transport/tests/TestSecureSessionMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ void CheckMessageTest(nlTestSuite * inSuite, void * inContext)
ctx.GetInetLayer().SystemLayer()->Init(nullptr);

chip::System::PacketBuffer * buffer = chip::System::PacketBuffer::NewWithAvailableSize(payload_len);
NL_TEST_ASSERT(inSuite, buffer != nullptr);

memmove(buffer->Start(), PAYLOAD, payload_len);
buffer->SetDataLength(payload_len);

Expand Down