From: Eunhae Choi <eunhae1.choi@samsung.com>
Date: Tue, 12 Jul 2016 04:49:13 +0000 (+0900)
Subject: fix svace issue
X-Git-Tag: submit/tizen/20160712.061810^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b922a3ee2f55d6bb08a2bc46a720afc402e867d0;p=platform%2Fcore%2Fapi%2Fmediastreamer.git

fix svace issue

Change-Id: Ie021f598a90c3551958155b197060f92e8a2e64b
---

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 0aeaa64..d0c2ad1 100644
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer library in Tizen Native API
-Version:    0.1.6
+Version:    0.1.7
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index 7bfb032..80d5ef6 100644
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -1390,29 +1390,30 @@ int __ms_pipeline_create(media_streamer_s *ms_streamer)
 
 	int *argc = (int *)malloc(sizeof(int));
 	char **argv = NULL;
-	if (argc) {
-		*argc = 1;
-		if (ms_streamer->ini.gst_args)
-			(*argc) += g_strv_length(ms_streamer->ini.gst_args);
-
-		argv = (char **)calloc(*argc, sizeof(char*));
-		if (argv) {
-			argv[0] = g_strdup("MediaStreamer");
-
-			if (ms_streamer->ini.gst_args) {
-				int i = 0;
-				for ( ; ms_streamer->ini.gst_args[i]; ++i) {
-					argv[i+1] = ms_streamer->ini.gst_args[i];
-					ms_debug("Add [%s] gstreamer parameter.", argv[i+1]);
-				}
-			}
+	if (!argc) {
+		ms_error("Error allocation memory");
+		return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+	}
 
-		} else {
-			MS_SAFE_FREE(argc);
-			ms_error("Error allocation memory");
-		}
-	} else {
+	*argc = 1;
+	if (ms_streamer->ini.gst_args)
+		(*argc) += g_strv_length(ms_streamer->ini.gst_args);
+
+	argv = (char **)calloc(*argc, sizeof(char*));
+	if (!argv) {
+		MS_SAFE_FREE(argc);
 		ms_error("Error allocation memory");
+		return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+	}
+
+	argv[0] = g_strdup("MediaStreamer");
+
+	if (ms_streamer->ini.gst_args) {
+		int i = 0;
+		for ( ; ms_streamer->ini.gst_args[i]; ++i) {
+			argv[i+1] = ms_streamer->ini.gst_args[i];
+			ms_debug("Add [%s] gstreamer parameter.", argv[i+1]);
+		}
 	}
 
 	gboolean gst_ret = gst_init_check(argc, &argv, &err);