fix svace issue

Change-Id: Ie021f598a90c3551958155b197060f92e8a2e64b

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 0aeaa64..d0c2ad1 100644 (file)
--- 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 (file)
--- 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);