diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-21 11:22:47 -0400 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-21 11:22:47 -0400 |
commit | 24b3a361b095da5432366f7cf8d157548c8c5487 (patch) | |
tree | 26c899d4c315957bb4bceb1413952c9300716320 | |
parent | a3119c09b52b359fc745bd18b4ea10a653244a38 (diff) | |
download | sdl_core-24b3a361b095da5432366f7cf8d157548c8c5487.tar.gz |
Fix resource leaks introduced in RC baseline
Fixed CIDs 174941 and 174934
-rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 9 | ||||
-rw-r--r-- | src/components/application_manager/src/mobile_message_handler.cc | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 708f92b9fb..c419a4dd3f 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -2268,17 +2268,12 @@ bool ApplicationManagerImpl::ConvertSOtoMessage( } if (message.getElement(jhs::S_PARAMS).keyExists(strings::binary_data)) { - application_manager::BinaryData* binaryData = - new application_manager::BinaryData( + application_manager::BinaryData binaryData( message.getElement(jhs::S_PARAMS) .getElement(strings::binary_data) .asBinary()); - if (NULL == binaryData) { - LOG4CXX_ERROR(logger_, "Null pointer"); - return false; - } - output.set_binary_data(binaryData); + output.set_binary_data(&binaryData); } LOG4CXX_DEBUG(logger_, "Successfully parsed smart object into message"); diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc index f7beea670e..a3b5aa7dbd 100644 --- a/src/components/application_manager/src/mobile_message_handler.cc +++ b/src/components/application_manager/src/mobile_message_handler.cc @@ -196,8 +196,8 @@ MobileMessageHandler::HandleIncomingMessageProtocolV2( outgoing_message->set_payload_size(message->payload_size()); if (!payload.data.empty()) { - outgoing_message->set_binary_data( - new application_manager::BinaryData(payload.data)); + BinaryData binary_payload_data(payload.data); + outgoing_message->set_binary_data(&binary_payload_data); } return outgoing_message.release(); } |