From 435299f622269c0ac77c38cedabc859b8e22d130 Mon Sep 17 00:00:00 2001 From: byndyx Date: Tue, 19 Mar 2024 20:43:29 +0800 Subject: [PATCH] modify warn Signed-off-by: byndyx --- .../av_transport_input/av_transport_input_filter.cpp | 7 +++++-- .../av_transport_output/av_transport_output_filter.cpp | 2 +- .../av_transport_input_filter_test.cpp | 2 +- .../dsoftbus_output/dsoftbus_output_plugin.cpp | 4 ++-- .../output_control/src/output_controller_listener.cpp | 2 +- .../output_control/src/time_statistician.cpp | 2 ++ .../output_control_test/output_controller_test.cpp | 4 +++- av_transport/common/src/av_sync_utils.cpp | 5 ----- av_transport/common/src/softbus_channel_adapter.cpp | 6 +++--- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp b/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp index 4a5e5a3c..dad26b4b 100644 --- a/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp +++ b/av_transport/av_trans_engine/filters/av_transport_input/av_transport_input_filter.cpp @@ -211,7 +211,7 @@ ErrorCode AVInputFilter::FindPlugin() auto nameList = PluginManager::Instance().ListPlugins(PluginType::GENERIC_PLUGIN); for (const std::string& name : nameList) { auto info = PluginManager::Instance().GetPluginInfo(PluginType::GENERIC_PLUGIN, name); - if (info->outCaps.empty() || mime != info->outCaps[0].mime) { + if (info == nullptr || info->outCaps.empty() || mime != info->outCaps[0].mime) { continue; } if (DoNegotiate(info->outCaps) && CreatePlugin(info) == ErrorCode::SUCCESS) { @@ -554,9 +554,12 @@ ErrorCode AVInputFilter::PushData(const std::string& inPort, const AVBufferPtr& AVTRANS_LOGE("outPorts is empty or invalid!"); return ErrorCode::ERROR_INVALID_PARAMETER_VALUE; } - + TRUE_RETURN_V_MSG_E(buffer->GetMemory() == nullptr || buffer->GetBufferMeta() == nullptr, + ErrorCode::ERROR_NULL_POINTER, "buffer->GetMemory() or buffer->GetBufferMeta() is null"); size_t bufSize = buffer->GetMemory()->GetSize(); auto tempBuffer = std::make_shared(Plugin::BufferMetaType::VIDEO); + TRUE_RETURN_V_MSG_E(tempBuffer == nullptr || tempBuffer->GetMemory() == nullptr, + ErrorCode::ERROR_NULL_POINTER, "tempBuffer or tempBuffer->GetMemory() is null"); tempBuffer->pts = buffer->pts; tempBuffer->flag = buffer->flag; tempBuffer->AllocMemory(nullptr, bufSize); diff --git a/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp b/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp index 3e9072af..8478c8dd 100644 --- a/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp +++ b/av_transport/av_trans_engine/filters/av_transport_output/av_transport_output_filter.cpp @@ -188,7 +188,7 @@ ErrorCode AVOutputFilter::FindPlugin() auto nameList = PluginManager::Instance().ListPlugins(PluginType::GENERIC_PLUGIN); for (const std::string& name : nameList) { auto info = PluginManager::Instance().GetPluginInfo(PluginType::GENERIC_PLUGIN, name); - if (info->inCaps.empty() || mime != info->inCaps[0].mime) { + if (info == nullptr || info->inCaps.empty() || mime != info->inCaps[0].mime) { continue; } if (CreatePlugin(info) == ErrorCode::SUCCESS) { diff --git a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp index c6ed6794..3e0ed007 100644 --- a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp +++ b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp @@ -127,7 +127,7 @@ HWTEST_F(AvTransportInputFilterTest, Start_001, testing::ext::TestSize.Level1) HWTEST_F(AvTransportInputFilterTest, Start_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = - FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); + FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); avInputTest_->state_ = FilterState::READY; avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); diff --git a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/dsoftbus_output/dsoftbus_output_plugin.cpp b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/dsoftbus_output/dsoftbus_output_plugin.cpp index 15fa5e0d..3619053a 100644 --- a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/dsoftbus_output/dsoftbus_output_plugin.cpp +++ b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/dsoftbus_output/dsoftbus_output_plugin.cpp @@ -195,8 +195,8 @@ Status DsoftbusOutputPlugin::OpenSoftbusChannel() AVTRANS_LOGE("Register channel listener failed ret: %{public}d.", ret); return Status::ERROR_INVALID_OPERATION; } - std::string peerSessName_ = ownerName_ + "_" + RECEIVER_DATA_SESSION_NAME_SUFFIX; - ret = SoftbusChannelAdapter::GetInstance().OpenSoftbusChannel(sessionName_, peerSessName_, peerDevId_); + std::string peerSessName = ownerName_ + "_" + RECEIVER_DATA_SESSION_NAME_SUFFIX; + ret = SoftbusChannelAdapter::GetInstance().OpenSoftbusChannel(sessionName_, peerSessName, peerDevId_); if ((ret != DH_AVT_SUCCESS) && (ret != ERR_DH_AVT_SESSION_HAS_OPENED)) { AVTRANS_LOGE("Open softbus channel failed ret: %{public}d.", ret); return Status::ERROR_INVALID_OPERATION; diff --git a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/output_controller_listener.cpp b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/output_controller_listener.cpp index 348b5116..a7a60458 100644 --- a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/output_controller_listener.cpp +++ b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/output_controller_listener.cpp @@ -21,7 +21,7 @@ namespace DistributedHardware { int32_t OutputControllerListener::OnOutput(const std::shared_ptr& data) { std::shared_ptr output = output_.lock(); - TRUE_RETURN_V_MSG_E((!output), NOTIFY_FAILED, "Output is nullptr, notify failed."); + TRUE_RETURN_V_MSG_E(output == nullptr, NOTIFY_FAILED, "Output is nullptr, notify failed."); output->OnOutput(data); return NOTIFY_SUCCESS; } diff --git a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/time_statistician.cpp b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/time_statistician.cpp index ffa671d5..48f640d1 100644 --- a/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/time_statistician.cpp +++ b/av_transport/av_trans_engine/plugin/plugins/av_trans_output/output_control/src/time_statistician.cpp @@ -19,7 +19,9 @@ namespace OHOS { namespace DistributedHardware { void TimeStatistician::CalProcessTime(const std::shared_ptr& data) { + TRUE_RETURN(data == nullptr, "data is nullptr."); auto bufferMeta = data->GetBufferMeta(); + TRUE_RETURN(bufferMeta == nullptr, "bufferMeta is nullptr."); if (!bufferMeta->IsExist(Tag::USER_PUSH_DATA_TIME)) { ClearStatistics(); return; diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/output_control_test/output_controller_test.cpp b/av_transport/av_trans_engine/plugin/test/av_trans_output/output_control_test/output_controller_test.cpp index 25f1fed2..0672407b 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/output_control_test/output_controller_test.cpp +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/output_control_test/output_controller_test.cpp @@ -103,7 +103,9 @@ HWTEST_F(OutputControllerTest, ReleaseControl_001, testing::ext::TestSize.Level1 HWTEST_F(OutputControllerTest, ControlOutput_001, testing::ext::TestSize.Level1) { auto controller = std::make_shared(); - std::shared_ptr data = std::make_shared(); + std::shared_ptr data = nullptr; + controller->CalProcessTime(data); + data = std::make_shared(); controller->SetAllowControlState(false); int32_t ret = controller->ControlOutput(data); EXPECT_EQ(OUTPUT_FRAME, ret); diff --git a/av_transport/common/src/av_sync_utils.cpp b/av_transport/common/src/av_sync_utils.cpp index a6749762..e32bad26 100644 --- a/av_transport/common/src/av_sync_utils.cpp +++ b/av_transport/common/src/av_sync_utils.cpp @@ -91,7 +91,6 @@ int32_t WriteClockUnitToMemory(const AVTransSharedMemory &memory, AVSyncClockUni void *addr = ::mmap(nullptr, static_cast(memory.size), static_cast(prot), MAP_SHARED, memory.fd, 0); if (addr == MAP_FAILED) { - free(addr); addr = nullptr; AVTRANS_LOGE("shared memory mmap failed, mmap address is invalid."); return ERR_DH_AVT_SHARED_MEMORY_FAILED; @@ -133,7 +132,6 @@ int32_t ReadClockUnitFromMemory(const AVTransSharedMemory &memory, AVSyncClockUn void *addr = ::mmap(nullptr, static_cast(memory.size), static_cast(prot), MAP_SHARED, memory.fd, 0); if (addr == MAP_FAILED) { - free(addr); addr = nullptr; AVTRANS_LOGE("shared memory mmap failed, mmap address is invalid."); return ERR_DH_AVT_SHARED_MEMORY_FAILED; @@ -179,7 +177,6 @@ int32_t WriteFrameInfoToMemory(const AVTransSharedMemory &memory, uint32_t frame void *addr = ::mmap(nullptr, static_cast(memory.size), static_cast(prot), MAP_SHARED, memory.fd, 0); if (addr == MAP_FAILED) { - free(addr); addr = nullptr; AVTRANS_LOGE("shared memory mmap failed, mmap address is invalid."); return ERR_DH_AVT_SHARED_MEMORY_FAILED; @@ -210,7 +207,6 @@ int32_t ReadFrameInfoFromMemory(const AVTransSharedMemory &memory, uint32_t &fra void *addr = ::mmap(nullptr, static_cast(memory.size), static_cast(prot), MAP_SHARED, memory.fd, 0); if (addr == MAP_FAILED) { - free(addr); addr = nullptr; AVTRANS_LOGE("shared memory mmap failed, mmap address is invalid."); return ERR_DH_AVT_SHARED_MEMORY_FAILED; @@ -242,7 +238,6 @@ int32_t ResetSharedMemory(const AVTransSharedMemory &memory) void *addr = ::mmap(nullptr, static_cast(memory.size), static_cast(prot), MAP_SHARED, memory.fd, 0); if (addr == MAP_FAILED) { - free(addr); addr = nullptr; AVTRANS_LOGE("shared memory mmap failed, mmap address is invalid."); return ERR_DH_AVT_SHARED_MEMORY_FAILED; diff --git a/av_transport/common/src/softbus_channel_adapter.cpp b/av_transport/common/src/softbus_channel_adapter.cpp index 424f5752..0b624cbb 100644 --- a/av_transport/common/src/softbus_channel_adapter.cpp +++ b/av_transport/common/src/softbus_channel_adapter.cpp @@ -139,7 +139,7 @@ std::string SoftbusChannelAdapter::TransName2PkgName(const std::string &ownerNam }; auto foundItem = std::find_if(std::begin(mapArray), std::end(mapArray), [&](const auto& item) { return item.first == ownerName; }); - if (foundItem != std::end(mapArray)) { + if (foundItem != std::end(mapArray) && foundItem != nullptr) { return foundItem->second; } return EMPTY_STRING; @@ -149,7 +149,7 @@ std::string SoftbusChannelAdapter::FindSessNameByPeerSessName(const std::string { auto foundItem = std::find_if(std::begin(LOCAL_TO_PEER_SESSION_NAME_MAP), std::end(LOCAL_TO_PEER_SESSION_NAME_MAP), [&](const auto& item) { return item.first == peerSessionName; }); - if (foundItem != std::end(LOCAL_TO_PEER_SESSION_NAME_MAP)) { + if (foundItem != std::end(LOCAL_TO_PEER_SESSION_NAME_MAP) && foundItem != nullptr) { return foundItem->second; } return EMPTY_STRING; @@ -556,7 +556,7 @@ void SoftbusChannelAdapter::OnSoftbusStreamReceived(int32_t sessionId, const Str void SoftbusChannelAdapter::OnSoftbusTimeSyncResult(const TimeSyncResultInfo *info, int32_t result) { AVTRANS_LOGI("On softbus channel time sync result:%{public}" PRId32, result); - TRUE_RETURN(result == 0, "On softbus channel time sync failed"); + TRUE_RETURN(result == 0 || info == nullptr, "On softbus channel time sync failed or info is null"); int32_t millisecond = info->result.millisecond; int32_t microsecond = info->result.microsecond; -- Gitee