d2d-conv-manager: fix svace_2.2 issues

fix issues which are checked by svace script.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I02ad5d33c13fbc3a807a7d8c83ff47222ebbd141

diff --git a/msf_tizen_client/src/Application.cpp b/msf_tizen_client/src/Application.cpp
index 2e7d8f0..f4521b9 100755 (executable)
--- a/msf_tizen_client/src/Application.cpp
+++ b/msf_tizen_client/src/Application.cpp
@@ -34,6 +34,8 @@ class start_result_callback : public Result_Base
 public:
        OnStartAppListener** in_result_cb  = NULL;
 
+       start_result_callback() { }
+
        void onSuccess(bool result)
        {
                MSF_DBG("start result callback onSuccess()");
@@ -64,6 +66,8 @@ class stop_result_callback : public Result_Base
 public:
        OnStopAppListener** in_result_cb  = NULL;
 
+       stop_result_callback() { }
+
        void onSuccess(bool result)
        {
                MSF_DBG("stop result callback onSuccess()");
@@ -188,16 +192,22 @@ void Application::start()
        map<string, string> params = getparams();
 
        start_result_callback* start_app_result_listener = new start_result_callback();
-       start_app_result_listener->in_result_cb = &start_app_listener;
-       invokeMethod(webapp?Message::METHOD_WEB_APPLICATION_START : Message::METHOD_APPLICATION_START, params, start_app_result_listener);
+
+       if (start_app_result_listener) {
+               start_app_result_listener->in_result_cb = &start_app_listener;
+               invokeMethod(webapp?Message::METHOD_WEB_APPLICATION_START : Message::METHOD_APPLICATION_START, params, start_app_result_listener);
+       }
 }
 
 void Application::stop()
 {
        map<string, string> params = getparams();
        stop_result_callback* stop_app_result_listener = new stop_result_callback();
-       stop_app_result_listener->in_result_cb = &stop_app_listener;
-       invokeMethod(webapp?Message::METHOD_WEB_APPLICATION_STOP : Message::METHOD_APPLICATION_STOP, params, stop_app_result_listener);
+
+       if (stop_app_result_listener) {
+               stop_app_result_listener->in_result_cb = &stop_app_listener;
+               invokeMethod(webapp?Message::METHOD_WEB_APPLICATION_STOP : Message::METHOD_APPLICATION_STOP, params, stop_app_result_listener);
+       }
 }
 
 void Application::install()

diff --git a/msf_tizen_client/src/Channel.cpp b/msf_tizen_client/src/Channel.cpp
index 3512ad9..5eab686 100755 (executable)
--- a/msf_tizen_client/src/Channel.cpp
+++ b/msf_tizen_client/src/Channel.cpp
@@ -627,7 +627,9 @@ bool Channel::connect(map<string, string> attributes, Result_Base *result1) {
        map<string, string> *at_data = new map<string, string>(attributes);
        map<Channel *, map<string, string> *> *pt_user_data =
                new map<Channel *, map<string, string> *>();
-       pt_user_data->insert({this, at_data});
+       if (pt_user_data) {
+               pt_user_data->insert({this, at_data});
+       }
 
        int status = pthread_create(&connect_thread, NULL, pt_startConnect,
                                                                (void *)pt_user_data);

diff --git a/msf_tizen_client/src/Clients.cpp b/msf_tizen_client/src/Clients.cpp
index 2c9d077..69b3762 100755 (executable)
--- a/msf_tizen_client/src/Clients.cpp
+++ b/msf_tizen_client/src/Clients.cpp
@@ -41,7 +41,9 @@ Client* Clients::getHost()
                for (std::vector<Client>::iterator it = clients.begin() ; it != clients.end(); ++it) {
                        if ((*it).isHost()) {
                                host = new Client();
-                               host->create(*it);
+                               if (host) {
+                                       host->create(*it);
+                               }
                        }
                }
        }

diff --git a/msf_tizen_client/src/MSFDSearchProvider.cpp b/msf_tizen_client/src/MSFDSearchProvider.cpp
index 3c75495..baa13ff 100755 (executable)
--- a/msf_tizen_client/src/MSFDSearchProvider.cpp
+++ b/msf_tizen_client/src/MSFDSearchProvider.cpp
@@ -57,6 +57,8 @@ class ResultMSFDServiceCallback : public Result_Base
                string ip_id;
                int provider_type;
 
+               ResultMSFDServiceCallback() { }
+
                void onSuccess(Service svc)
                {
                        MSF_DBG("MSFD Service Callback onSucces()");
@@ -268,11 +270,13 @@ void MSFDSearchProvider::processReceivedMsg(char *buf, int buflen)
        } else if (state == STATE_ALIVE || state == STATE_UP) {
                if (itr == aliveMap.end()) {
                        ResultMSFDServiceCallback *rService = new ResultMSFDServiceCallback();
-                       rService->MSFDSearchProvider_pointer = this;
-                       rService->ttl = ttl;
-                       rService->provider_type = MSFD;
-                       rService->ip_id = ip;
-                       Service::getByURI(url, SERVICE_CHECK_TIMEOUT, rService);
+                       if (rService) {
+                               rService->MSFDSearchProvider_pointer = this;
+                               rService->ttl = ttl;
+                               rService->provider_type = MSFD;
+                               rService->ip_id = ip;
+                               Service::getByURI(url, SERVICE_CHECK_TIMEOUT, rService);
+                       }
                } else {
                        updateAlive(ttl, ip, MSFD);
                }

diff --git a/msf_tizen_client/test/main.cpp b/msf_tizen_client/test/main.cpp
index 20adc8f..d5116a9 100755 (executable)
--- a/msf_tizen_client/test/main.cpp
+++ b/msf_tizen_client/test/main.cpp
@@ -567,8 +567,10 @@ void connect()
 
        application = new Application(&(*service), "http://www.google.com", "test");
 
-       application->setonConnectListener(&connect_listener);
-       application->connect();
+       if (application) {
+               application->setonConnectListener(&connect_listener);
+               application->connect();
+       }
 }
 
 void disconnect()