diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 6811279e5eec247ad31717df3b7a5a1b4fcdd590..169fb685157b194f2fe52d3338fcc968a0a8405f 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -228,9 +228,6 @@ int32_t GetAudioParamStr(const std::string ¶ms, const std::string &key, std: } size_t splitPosEnd = params.find(';', pos); if (splitPosEnd != params.npos) { - if (pos + step + 1 > splitPosEnd) { - return ERR_DH_AUDIO_FAILED; - } value = params.substr(pos + step + 1, splitPosEnd - pos - step - 1); } else { value = params.substr(pos + step + 1); diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 47d0312b7f8dad647272c8c535ccbbd7e1a92763..5e308d3c8fa465ea64ffaba3dd8faf3c2cb30a59 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -128,12 +128,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) DHLOGE("Not found the keys."); return ERR_DH_AUDIO_FAILED; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } - int32_t dhId = ConvertString2Int(std::string(temp->valuestring)); + int32_t dhId = ConvertString2Int(std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring)); CHECK_AND_FREE_RETURN_RET_LOG(dhId == -1, ERR_DH_AUDIO_NULLPTR, jParam, "%{public}s", "Parse dhId error."); std::shared_ptr speakerClient = nullptr; @@ -713,13 +708,8 @@ void DAudioSinkDev::SinkEventHandler::NotifyOpenMic(const AppExecFwk::InnerEvent return; } int32_t ret = sinkDevObj->TaskOpenDMic(eventParam); - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } sinkDevObj->NotifySourceDev(NOTIFY_OPEN_MIC_RESULT, - std::string(temp->valuestring), ret); + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), ret); DHLOGI("Open mic device task end, notify source ret %{public}d.", ret); CHECK_AND_FREE_RETURN_LOG(ret != DH_SUCCESS, jParam, "%{public}s", "Open mic failed."); cJSON_Delete(jParam); diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index d39ea9a3afb1d1e798c853f2a06cc58c9de1107d..375cdffab2e496ad6a8d759a672e52d380ff83cd 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -142,9 +142,6 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); - if (jParam == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { DHLOGD("Receive audio notify from source, random task code: %{public}s", cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 422f867d0b61ddbb9c1f570e8b4f8ab9c0b199a4..e6abf306e14526122dab8c44196dceee69acbdd8 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -387,12 +387,8 @@ int32_t DAudioSourceDev::HandleNotifyRPC(const AudioEvent &event) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_RESULT); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } - rpcResult_ = temp->valueint; + + rpcResult_ = cJSON_GetObjectItem(jParam, KEY_RESULT)->valueint; DHLOGD("Notify RPC event: %{public}d, result: %{public}d.", event.type, rpcResult_); std::map::iterator iter = eventNotifyMap_.find(event.type); if (iter == eventNotifyMap_.end()) { @@ -658,18 +654,8 @@ void DAudioSourceDev::OnEnableTaskResult(int32_t resultCode, const std::string & cJSON_Delete(jParam); return; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DEV_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } - cJSON *temporary = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temporary == NULL || !cJSON_IsString(temporary)) { - cJSON_Delete(jParam); - return; - } - mgrCallback_->OnEnableAudioResult(std::string(temp->valuestring), - std::string(temporary->valuestring), resultCode); + mgrCallback_->OnEnableAudioResult(std::string(cJSON_GetObjectItem(jParam, KEY_DEV_ID)->valuestring), + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), resultCode); cJSON_Delete(jParam); } @@ -736,18 +722,8 @@ void DAudioSourceDev::OnDisableTaskResult(int32_t resultCode, const std::string cJSON_Delete(jParam); return; } - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_DEV_ID); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return; - } - cJSON *temporary = cJSON_GetObjectItem(jParam, KEY_DH_ID); - if (temporary == NULL || !cJSON_IsString(temporary)) { - cJSON_Delete(jParam); - return; - } - mgrCallback_->OnDisableAudioResult(std::string(temp->valuestring), - std::string(temporary->valuestring), resultCode); + mgrCallback_->OnDisableAudioResult(std::string(cJSON_GetObjectItem(jParam, KEY_DEV_ID)->valuestring), + std::string(cJSON_GetObjectItem(jParam, KEY_DH_ID)->valuestring), resultCode); cJSON_Delete(jParam); } diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 29719cbdbebb0f4a3c097f6ac132127903e60154..e6ca12f3d8075e1d9382b71291508153a2d15fdb 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -292,13 +292,8 @@ int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const // now ctrl channel is also goto here, please sure here not crash. cJSON *jParam = cJSON_Parse(eventContent.c_str()); if (CJsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { - cJSON *temp = cJSON_GetObjectItem(jParam, KEY_RANDOM_TASK_CODE); - if (temp == NULL || !cJSON_IsString(temp)) { - cJSON_Delete(jParam); - return ERR_DH_AUDIO_FAILED; - } DHLOGD("Receive audio notify from sink, random task code: %{public}s", - temp->valuestring); + cJSON_GetObjectItemCaseSensitive(jParam, KEY_RANDOM_TASK_CODE)->valuestring); } std::shared_ptr sourceDev = nullptr;