From c7c9ce582df333c1cceabc59b3ab9aa79703dc6e Mon Sep 17 00:00:00 2001
From: liuyaxuan <liuyaxuan@superred.com.cn>
Date: Sat, 26 Aug 2023 09:56:01 +0000
Subject: [PATCH] fix_memory_leak_01

---
 frameworks/js/camera_napi/src/input/camera_info_napi.cpp      | 2 +-
 frameworks/js/camera_napi/src/input/camera_input_napi.cpp     | 2 +-
 frameworks/js/camera_napi/src/input/camera_manager_napi.cpp   | 2 +-
 frameworks/js/camera_napi/src/input/camera_napi.cpp           | 2 +-
 frameworks/js/camera_napi/src/input/camera_profile_napi.cpp   | 4 ++--
 frameworks/js/camera_napi/src/input/camera_size_napi.cpp      | 2 +-
 frameworks/js/camera_napi/src/output/camera_output_napi.cpp   | 2 +-
 frameworks/js/camera_napi/src/output/metadata_object_napi.cpp | 4 ++--
 frameworks/js/camera_napi/src/output/metadata_output_napi.cpp | 4 ++--
 frameworks/js/camera_napi/src/output/photo_output_napi.cpp    | 2 +-
 frameworks/js/camera_napi/src/output/preview_output_napi.cpp  | 2 +-
 frameworks/js/camera_napi/src/output/video_output_napi.cpp    | 2 +-
 frameworks/js/camera_napi/src/session/camera_session_napi.cpp | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/frameworks/js/camera_napi/src/input/camera_info_napi.cpp b/frameworks/js/camera_napi/src/input/camera_info_napi.cpp
index c677a06..1c4e5aa 100644
--- a/frameworks/js/camera_napi/src/input/camera_info_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_info_napi.cpp
@@ -43,7 +43,7 @@ void CameraDeviceNapi::CameraDeviceNapiDestructor(napi_env env, void* nativeObje
     MEDIA_DEBUG_LOG("CameraDeviceNapiDestructor enter");
     CameraDeviceNapi* cameraObj = reinterpret_cast<CameraDeviceNapi*>(nativeObject);
     if (cameraObj != nullptr) {
-        cameraObj->~CameraDeviceNapi();
+	delete cameraObj;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/input/camera_input_napi.cpp b/frameworks/js/camera_napi/src/input/camera_input_napi.cpp
index cf62b95..465285e 100644
--- a/frameworks/js/camera_napi/src/input/camera_input_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_input_napi.cpp
@@ -100,7 +100,7 @@ void CameraInputNapi::CameraInputNapiDestructor(napi_env env, void* nativeObject
     MEDIA_DEBUG_LOG("CameraInputNapiDestructor enter");
     CameraInputNapi* cameraObj = reinterpret_cast<CameraInputNapi*>(nativeObject);
     if (cameraObj != nullptr) {
-        cameraObj->~CameraInputNapi();
+	delete cameraObj;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp b/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp
index e4d6fcc..be23d86 100644
--- a/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp
@@ -80,7 +80,7 @@ void CameraManagerNapi::CameraManagerNapiDestructor(napi_env env, void* nativeOb
     MEDIA_DEBUG_LOG("CameraManagerNapiDestructor enter");
     CameraManagerNapi* camera = reinterpret_cast<CameraManagerNapi*>(nativeObject);
     if (camera != nullptr) {
-        camera->~CameraManagerNapi();
+	delete camera;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/input/camera_napi.cpp b/frameworks/js/camera_napi/src/input/camera_napi.cpp
index d838391..27fd8cf 100644
--- a/frameworks/js/camera_napi/src/input/camera_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_napi.cpp
@@ -86,7 +86,7 @@ void CameraNapi::CameraNapiDestructor(napi_env env, void* nativeObject, void* fi
 {
     CameraNapi* camera = reinterpret_cast<CameraNapi*>(nativeObject);
     if (camera != nullptr) {
-        camera->~CameraNapi();
+	delete camera;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/input/camera_profile_napi.cpp b/frameworks/js/camera_napi/src/input/camera_profile_napi.cpp
index 0c2a314..effd218 100644
--- a/frameworks/js/camera_napi/src/input/camera_profile_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_profile_napi.cpp
@@ -44,7 +44,7 @@ void CameraProfileNapi::CameraProfileNapiDestructor(napi_env env, void* nativeOb
     CameraProfileNapi* cameraProfileNapi = reinterpret_cast<CameraProfileNapi*>(nativeObject);
     if (cameraProfileNapi != nullptr) {
         MEDIA_INFO_LOG("CameraProfileNapi::CameraProfileNapiDestructor ~");
-        cameraProfileNapi->~CameraProfileNapi();
+	delete cameraProfileNapi;
     }
 }
 
@@ -219,7 +219,7 @@ void CameraVideoProfileNapi::CameraVideoProfileNapiDestructor(napi_env env, void
 {
     CameraVideoProfileNapi* cameraVideoProfileNapi = reinterpret_cast<CameraVideoProfileNapi*>(nativeObject);
     if (cameraVideoProfileNapi != nullptr) {
-        cameraVideoProfileNapi->~CameraVideoProfileNapi();
+	delete cameraVideoProfileNapi;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/input/camera_size_napi.cpp b/frameworks/js/camera_napi/src/input/camera_size_napi.cpp
index cbb8402..54c3d69 100644
--- a/frameworks/js/camera_napi/src/input/camera_size_napi.cpp
+++ b/frameworks/js/camera_napi/src/input/camera_size_napi.cpp
@@ -43,7 +43,7 @@ void CameraSizeNapi::CameraSizeNapiDestructor(napi_env env, void* nativeObject,
     MEDIA_DEBUG_LOG("CameraSizeNapiDestructor enter");
     CameraSizeNapi* cameraSizeNapi = reinterpret_cast<CameraSizeNapi*>(nativeObject);
     if (cameraSizeNapi != nullptr) {
-        cameraSizeNapi->~CameraSizeNapi();
+	delete cameraSizeNapi;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/output/camera_output_napi.cpp b/frameworks/js/camera_napi/src/output/camera_output_napi.cpp
index c7f0eb7..ea15fd2 100644
--- a/frameworks/js/camera_napi/src/output/camera_output_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/camera_output_napi.cpp
@@ -47,7 +47,7 @@ void CameraOutputCapabilityNapi::CameraOutputCapabilityNapiDestructor(
     CameraOutputCapabilityNapi* cameraOutputCapabilityNapi =
         reinterpret_cast<CameraOutputCapabilityNapi*>(nativeObject);
     if (cameraOutputCapabilityNapi != nullptr) {
-        cameraOutputCapabilityNapi->~CameraOutputCapabilityNapi();
+	delete cameraOutputCapabilityNapi;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp b/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp
index 267cee2..282360a 100644
--- a/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp
@@ -63,7 +63,7 @@ void MetadataObjectNapi::MetadataObjectNapiDestructor(napi_env env, void* native
     MEDIA_DEBUG_LOG("MetadataObjectNapiDestructor enter");
     MetadataObjectNapi* metadataObject = reinterpret_cast<MetadataObjectNapi*>(nativeObject);
     if (metadataObject != nullptr) {
-        metadataObject->~MetadataObjectNapi();
+	delete metadataObject;
     }
 }
 
@@ -206,4 +206,4 @@ napi_value MetadataObjectNapi::GetBoundingBox(napi_env env, napi_callback_info i
     return result;
 }
 } // namespace CameraStandard
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp b/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp
index 0183598..487bf4e 100644
--- a/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp
@@ -147,7 +147,7 @@ void MetadataOutputNapi::MetadataOutputNapiDestructor(napi_env env, void* native
     MEDIA_DEBUG_LOG("MetadataOutputNapiDestructor enter");
     MetadataOutputNapi* metadataOutput = reinterpret_cast<MetadataOutputNapi*>(nativeObject);
     if (metadataOutput != nullptr) {
-        metadataOutput->~MetadataOutputNapi();
+	delete metadataOutput;
     }
 }
 
@@ -646,4 +646,4 @@ napi_value MetadataOutputNapi::On(napi_env env, napi_callback_info info)
     return undefinedResult;
 }
 } // namespace CameraStandard
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp
index e828580..b69cb72 100644
--- a/frameworks/js/camera_napi/src/output/photo_output_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/photo_output_napi.cpp
@@ -188,7 +188,7 @@ void PhotoOutputNapi::PhotoOutputNapiDestructor(napi_env env, void* nativeObject
     MEDIA_DEBUG_LOG("PhotoOutputNapiDestructor enter");
     PhotoOutputNapi* photoOutput = reinterpret_cast<PhotoOutputNapi*>(nativeObject);
     if (photoOutput != nullptr) {
-        photoOutput->~PhotoOutputNapi();
+	delete photoOutput;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/output/preview_output_napi.cpp b/frameworks/js/camera_napi/src/output/preview_output_napi.cpp
index 9de9921..a12fd7a 100644
--- a/frameworks/js/camera_napi/src/output/preview_output_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/preview_output_napi.cpp
@@ -153,7 +153,7 @@ void PreviewOutputNapi::PreviewOutputNapiDestructor(napi_env env, void* nativeOb
     MEDIA_DEBUG_LOG("PreviewOutputNapiDestructor enter");
     PreviewOutputNapi* cameraObj = reinterpret_cast<PreviewOutputNapi*>(nativeObject);
     if (cameraObj != nullptr) {
-        cameraObj->~PreviewOutputNapi();
+	delete cameraObj;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/output/video_output_napi.cpp b/frameworks/js/camera_napi/src/output/video_output_napi.cpp
index b368a86..f7dd243 100644
--- a/frameworks/js/camera_napi/src/output/video_output_napi.cpp
+++ b/frameworks/js/camera_napi/src/output/video_output_napi.cpp
@@ -152,7 +152,7 @@ void VideoOutputNapi::VideoOutputNapiDestructor(napi_env env, void* nativeObject
     MEDIA_DEBUG_LOG(" VideoOutputNapiDestructor enter");
     VideoOutputNapi* videoOutput = reinterpret_cast<VideoOutputNapi*>(nativeObject);
     if (videoOutput != nullptr) {
-        videoOutput->~VideoOutputNapi();
+	delete videoOutput;
     }
 }
 
diff --git a/frameworks/js/camera_napi/src/session/camera_session_napi.cpp b/frameworks/js/camera_napi/src/session/camera_session_napi.cpp
index 30e0db7..3a5908c 100755
--- a/frameworks/js/camera_napi/src/session/camera_session_napi.cpp
+++ b/frameworks/js/camera_napi/src/session/camera_session_napi.cpp
@@ -200,7 +200,7 @@ void CameraSessionNapi::CameraSessionNapiDestructor(napi_env env, void* nativeOb
     MEDIA_DEBUG_LOG("CameraSessionNapiDestructor enter");
     CameraSessionNapi* cameraObj = reinterpret_cast<CameraSessionNapi*>(nativeObject);
     if (cameraObj != nullptr) {
-        cameraObj->~CameraSessionNapi();
+	delete cameraObj;
     }
 }
 
-- 
Gitee