From 58f792700703da5e38bc84e437773c854008e77e Mon Sep 17 00:00:00 2001 From: byndyx Date: Tue, 5 Dec 2023 17:31:51 +0800 Subject: [PATCH] fix multi delete Signed-off-by: byndyx --- common/src/daudio_util.cpp | 1 - services/audioclient/spkclient/src/dspeaker_client.cpp | 7 ------- services/audiomanager/managersink/src/daudio_sink_dev.cpp | 1 - .../audiomanager/managersource/src/daudio_source_dev.cpp | 3 --- 4 files changed, 12 deletions(-) diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 6a85c159..78f50ed5 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -464,7 +464,6 @@ std::string ParseStringFromArgs(std::string args, const char *key) cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); return "Failed to parse JSON"; } if (!CJsonParamCheck(jParam, { key })) { diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index f75455a2..ae932fe9 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -659,12 +659,6 @@ int32_t DSpeakerClient::SendMessage(uint32_t type, std::string content, std::str void DSpeakerClient::PlayStatusChange(const std::string &args) { DHLOGI("Play status change, args: %s.", args.c_str()); - cJSON *jParam = cJSON_Parse(args.c_str()); - if (jParam == nullptr) { - DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); - return; - } std::string changeType = ParseStringFromArgs(args, KEY_CHANGE_TYPE); if (changeType == AUDIO_EVENT_RESTART) { ReStart(); @@ -673,7 +667,6 @@ void DSpeakerClient::PlayStatusChange(const std::string &args) } else { DHLOGE("Play status error."); } - cJSON_Delete(jParam); } void DSpeakerClient::SetAttrs(const std::string &devId, const std::shared_ptr &callback) diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index d17b4578..e4147c03 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -202,7 +202,6 @@ int32_t DAudioSinkDev::ParseDhidFromEvent(std::string args) cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); return -1; } if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index da289694..8822d51d 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -781,7 +781,6 @@ int32_t DAudioSourceDev::ParseDhidFromEvent(std::string args) cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); return -1; } if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { @@ -1039,7 +1038,6 @@ int32_t DAudioSourceDev::TaskChangeVolume(const std::string &args) cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); return ERR_DH_AUDIO_NULLPTR; } if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { @@ -1075,7 +1073,6 @@ int32_t DAudioSourceDev::TaskChangeRenderState(const std::string &args) cJSON *jParam = cJSON_Parse(args.c_str()); if (jParam == nullptr) { DHLOGE("Failed to parse JSON: %s", cJSON_GetErrorPtr()); - cJSON_Delete(jParam); return ERR_DH_AUDIO_NULLPTR; } if (!CJsonParamCheck(jParam, { KEY_DH_ID })) { -- Gitee