diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index 6a85c1594eeb51e6ef91954ec7a50f3f8da1c4fe..78f50ed52b4a19894b415bacfe537906a5297912 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 f75455a27c52702d60282954919e0e87d15ad2c3..ae932fe948f2d750a7db1cf65b0b3a84ed15cd6a 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 d17b4578fa97786296191ff175bd6e9969c94a18..e4147c0378c64e24514a1a0fbe07a7631c8f6d50 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 da289694d10923718054177ca1d33ce15d41ead5..8822d51dd1aa40bddbc78804fb3aac49739b869c 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 })) {