From: Sangchul Lee <sc11.lee@samsung.com>
Date: Tue, 8 Dec 2015 07:33:08 +0000 (+0900)
Subject: Fix svace defects
X-Git-Tag: submit/tizen/20151208.091656^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F53616%2F1;p=platform%2Fcore%2Fapi%2Fsound-manager.git

Fix svace defects

[Version] Release 0.3.33
[Profile] Common
[Issue Type] Fix Bug

Change-Id: I54c68fd12482bd805b98eba67fb2788555434125
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
---

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 826b062..56ea073 100755
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.3.32
+Version:    0.3.33
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/src/sound_manager.c b/src/sound_manager.c
index f5df673..368db9f 100644
--- a/src/sound_manager.c
+++ b/src/sound_manager.c
@@ -188,6 +188,8 @@ int sound_manager_create_stream_information(sound_stream_type_e stream_type, sou
 	if (g_session_interrupt_cb_table.is_registered)
 		return _convert_sound_manager_error_code(__func__, MM_ERROR_SOUND_INTERNAL);
 
+	SM_ENTER_CRITICAL_SECTION_WITH_RETURN(&g_stream_info_count_mutex, MM_ERROR_SOUND_INTERNAL);
+
 	sound_stream_info_s *stream_h = malloc(sizeof(sound_stream_info_s));
 	if (!stream_h) {
 		ret = MM_ERROR_OUT_OF_MEMORY;
@@ -195,19 +197,19 @@ int sound_manager_create_stream_information(sound_stream_type_e stream_type, sou
 		memset(stream_h, 0, sizeof(sound_stream_info_s));
 		ret = _convert_stream_type(stream_type, &stream_h->stream_type);
 		if (ret == MM_ERROR_NONE) {
-			SM_ENTER_CRITICAL_SECTION_WITH_RETURN(&g_stream_info_count_mutex, MM_ERROR_SOUND_INTERNAL);
 			ret = _make_pa_connection_and_register_focus(stream_h, callback, user_data);
 			if (ret == MM_ERROR_NONE) {
 				*stream_info = (sound_stream_info_h)stream_h;
 				SM_REF_FOR_STREAM_INFO(g_stream_info_count, ret);
 				LOGI("<< leave : stream_h(%p), index(%u), user_cb(%p), cnt(%d), ret(%p)", stream_h, stream_h->index, stream_h->user_cb, g_stream_info_count, ret);
 			}
-			SM_LEAVE_CRITICAL_SECTION(&g_stream_info_count_mutex);
 		}
 		if (ret)
 			free(stream_h);
 	}
 
+	SM_LEAVE_CRITICAL_SECTION(&g_stream_info_count_mutex);
+
 	return _convert_sound_manager_error_code(__func__, ret);
 }
 
diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index da80a6e..02e66a2 100644
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -577,7 +577,7 @@ int _get_stream_conf_info(const char *stream_type, stream_conf_info_s *info)
 		item = g_variant_get_variant(child);
 		g_variant_iter_init(&iter, item);
 		while (g_variant_iter_loop(&iter, "&s", &name)) {
-			if (!strncmp(name, "none", strlen("none"))) {
+			if (name && !strncmp(name, "none", strlen("none"))) {
 				/* skip it */
 			} else {
 				/* we use volume type only for out direction */
diff --git a/test/sound_manager_test.c b/test/sound_manager_test.c
index 2ddea3d..0e6ea7e 100644
--- a/test/sound_manager_test.c
+++ b/test/sound_manager_test.c
@@ -579,7 +579,7 @@ static void interpret(char *cmd)
 	}
 	case CURRENT_STATUS_SET_VOLUME: {
 		static int cnt = 0;
-		sound_type_e type;
+		static sound_type_e type;
 		int volume;
 		switch (cnt) {
 		case 0: