From: SeokHoon Lee <andy.shlee@samsung.com>
Date: Tue, 29 Dec 2015 02:41:17 +0000 (+0900)
Subject: Release version 0.2.23
X-Git-Tag: accepted/tizen/mobile/20151229.114627^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c45a24758590bf202d254ae080956bf1065ecf8;p=platform%2Fcore%2Fmultimedia%2Fmmsvc-camera.git

Release version 0.2.23

1. fix Svace issue( MEMOLY_LEAK )

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I53e4ec2062a727582c9e9260babf1c6c2a38f167
---

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index f8da27d..6833c36 100755
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -868,10 +868,6 @@ int camera_dispatcher_create(muse_module_h module)
 
 	memset(muse_camera, 0x0, sizeof(muse_camera_handle_s));
 
-	g_mutex_init(&muse_camera->list_lock);
-	g_mutex_init(&muse_camera->preview_cb_lock);
-	g_cond_init(&muse_camera->preview_cb_cond);
-
 	if (muse_core_ipc_get_bufmgr(&muse_camera->bufmgr) != MM_ERROR_NONE) {
 		LOGE("muse_core_ipc_get_bufmgr failed");
 
@@ -894,12 +890,7 @@ int camera_dispatcher_create(muse_module_h module)
 	}
 
 	ret = legacy_camera_set_client_pid(muse_camera->camera_handle, pid);
-	if (ret == CAMERA_ERROR_NONE) {
-		LOGD("handle : 0x%x", muse_camera);
-		handle = (intptr_t)muse_camera;
-		muse_core_ipc_set_handle(module, (intptr_t)muse_camera);
-		muse_camera_msg_return1(api, class, ret, module, POINTER, handle);
-	} else {
+	if (ret != CAMERA_ERROR_NONE) {
 		LOGE("legacy_camera_set_client_pid failed : 0x%x", ret);
 
 		legacy_camera_destroy(muse_camera->camera_handle);
@@ -907,10 +898,20 @@ int camera_dispatcher_create(muse_module_h module)
 
 		free(muse_camera);
 		muse_camera = NULL;
-
 		muse_camera_msg_return(api, class, ret, module);
+
+		return MUSE_CAMERA_ERROR_NONE;
 	}
 
+	g_mutex_init(&muse_camera->list_lock);
+	g_mutex_init(&muse_camera->preview_cb_lock);
+	g_cond_init(&muse_camera->preview_cb_cond);
+
+	LOGD("handle : 0x%x", muse_camera);
+	handle = (intptr_t)muse_camera;
+	muse_core_ipc_set_handle(module, (intptr_t)muse_camera);
+	muse_camera_msg_return1(api, class, ret, module, POINTER, handle);
+
 	return MUSE_CAMERA_ERROR_NONE;
 }
 
diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 984c887..77bd341 100755
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.22
+Version:    0.2.23
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0