From 86d8317e76022f5bf2dca22cda42b690cb230de4 Mon Sep 17 00:00:00 2001
From: atreeof_wind <atreeof_wind@noreply.gitcode.com>
Date: Mon, 11 Aug 2025 10:58:54 +0800
Subject: [PATCH] fix code warning

Signed-off-by: atreeof_wind <shaoyifan2@huawei.com>
---
 frameworks/cj/avplayer/cj_avplayer_callback.cpp             | 1 +
 frameworks/cj/metadatahelper/src/cj_avmetadataextractor.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frameworks/cj/avplayer/cj_avplayer_callback.cpp b/frameworks/cj/avplayer/cj_avplayer_callback.cpp
index 2cd650f8d..ef30e8a5b 100644
--- a/frameworks/cj/avplayer/cj_avplayer_callback.cpp
+++ b/frameworks/cj/avplayer/cj_avplayer_callback.cpp
@@ -175,6 +175,7 @@ void CJAVPlayerCallback::OnStateChangeCb(const int32_t extra, const Format &info
         listener_->NotifyState(state);
     }
 
+    std::lock_guard<std::mutex> lock(mutex_);
     if (state_ != state) {
         state_ = state;
         std::string stateStr;
diff --git a/frameworks/cj/metadatahelper/src/cj_avmetadataextractor.cpp b/frameworks/cj/metadatahelper/src/cj_avmetadataextractor.cpp
index 9a0e88c00..eabef83f3 100644
--- a/frameworks/cj/metadatahelper/src/cj_avmetadataextractor.cpp
+++ b/frameworks/cj/metadatahelper/src/cj_avmetadataextractor.cpp
@@ -30,7 +30,7 @@ bool CreateCString(std::string value, char** result)
     if (*result == nullptr) {
         return false;
     }
-    if (memcpy_s(*result, value.size() + 1, value.c_str(), value.size()) != 0) {
+    if (memcpy_s(*result, (value.size() + 1) * sizeof(char), value.c_str(), value.size()) != 0) {
         MEDIA_LOGE("Failed to create string.");
         free(*result);
         return false;
@@ -46,6 +46,7 @@ bool CreateMapPair(std::string key, std::string value, char** keyPtr, char** val
     ret = CreateCString(value, valuePtr);
     if (ret == false) {
         free(*keyPtr);
+        keyPtr = nullptr;
     }
     return ret;
 }
-- 
Gitee