Remove media-util-internal.h

[platform/core/multimedia/media-server.git] / lib / media-util-cynara.c

diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c
index 3f93af8..f0f4c9c 100644 (file)
--- a/lib/media-util-cynara.c
+++ b/lib/media-util-cynara.c
@@ -32,7 +32,6 @@
 #include <media-util-cynara.h>
 #include <media-util-dbg.h>
 #include <media-util-err.h>
-#include <media-util-internal.h>
 
 #include <cynara-client.h>
 #include <cynara-session.h>
@@ -118,7 +117,10 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_
        ret = cynara_creds_socket_get_client(sockfd, CLIENT_METHOD_SMACK, &(credentials->smack));
        if (ret != 0) {
                MSAPI_DBG_ERR("[CYNARA]Failed to get smack");
-               MS_SAFE_FREE(credentials->uid);
+               if (credentials->uid) {
+                       free(credentials->uid);
+                       credentials->uid = NULL;
+               }
 
                return MS_MEDIA_ERR_INTERNAL;
        }
@@ -128,8 +130,8 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_
 
 int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege)
 {
-       int result;
-       char *session;
+       int result = 0;
+       char *session = NULL;
 
        if (!creds || !privilege)
                return MS_MEDIA_ERR_INVALID_PARAMETER;
@@ -144,7 +146,9 @@ int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege)
        if (result != CYNARA_API_ACCESS_ALLOWED)
                ms_cynara_dbg_err("cynara_check", result);
 
-       MS_SAFE_FREE(session);
+       if (session)
+               free(session);
+
        return result == CYNARA_API_ACCESS_ALLOWED ? MS_MEDIA_ERR_NONE : MS_MEDIA_ERR_PERMISSION_DENIED;
 }