Fixed svace issue

Change-Id: I048c15fe6745d45824a6ebf0601fa193965220c6
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/adaptor/auth-adaptor/auth-adaptor.c b/adaptor/auth-adaptor/auth-adaptor.c
index c0c118b..fa8b783 100644 (file)
--- a/adaptor/auth-adaptor/auth-adaptor.c
+++ b/adaptor/auth-adaptor/auth-adaptor.c
@@ -417,8 +417,16 @@ int auth_adaptor_register_listener(auth_adaptor_h adaptor,
 int auth_adaptor_unregister_listener(auth_adaptor_h adaptor,
                                                auth_adaptor_listener_h listener)
 {
-       if ((NULL == adaptor) || (NULL == listener)) {
-               auth_adaptor_error("Invalid argument""(adaptor: %p, listener: %p)", adaptor, listener);
+       if (NULL == adaptor)  {
+               auth_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return AUTH_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               auth_adaptor_error("Invalid argument (listener)");
                return AUTH_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/adaptor/contact-adaptor/contact-adaptor.c b/adaptor/contact-adaptor/contact-adaptor.c
index 368eae5..7b3315a 100644 (file)
--- a/adaptor/contact-adaptor/contact-adaptor.c
+++ b/adaptor/contact-adaptor/contact-adaptor.c
@@ -536,8 +536,16 @@ int contact_adaptor_unregister_listener(contact_adaptor_h adaptor,
 {
        contact_adaptor_warning("Deregister contact adaptor listener");
 
-       if ((NULL == adaptor) || (NULL == listener)) {
-               contact_adaptor_error("Invalid argument");
+       if (NULL == adaptor)  {
+               contact_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return CONTACT_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               contact_adaptor_error("Invalid argument (listener)");
                return CONTACT_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/adaptor/message-adaptor/message-adaptor.c b/adaptor/message-adaptor/message-adaptor.c
index fd9f617..fd7d2c3 100644 (file)
--- a/adaptor/message-adaptor/message-adaptor.c
+++ b/adaptor/message-adaptor/message-adaptor.c
@@ -555,8 +555,16 @@ int message_adaptor_register_listener(message_adaptor_h adaptor, message_adaptor
 EXPORT_API
 int message_adaptor_unregister_listener(message_adaptor_h adaptor, message_adaptor_listener_h listener)
 {
-       if ((NULL == adaptor) || (NULL == listener)) {
-               message_adaptor_error("Invalid argument");
+       if (NULL == adaptor)  {
+               message_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return MESSAGE_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               message_adaptor_error("Invalid argument (listener)");
                return MESSAGE_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/adaptor/push-adaptor/push-adaptor.c b/adaptor/push-adaptor/push-adaptor.c
index d93ff82..b562186 100644 (file)
--- a/adaptor/push-adaptor/push-adaptor.c
+++ b/adaptor/push-adaptor/push-adaptor.c
@@ -529,8 +529,16 @@ int push_adaptor_unregister_listener(push_adaptor_h adaptor, push_adaptor_listen
 {
        push_adaptor_warning("Unregister push adaptor listener");
 
-       if ((NULL == adaptor) || (NULL == listener)) {
-               push_adaptor_error("Invalid argument");
+       if (NULL == adaptor)  {
+               push_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return PUSH_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               push_adaptor_error("Invalid argument (listener)");
                return PUSH_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/adaptor/shop-adaptor/shop-adaptor.c b/adaptor/shop-adaptor/shop-adaptor.c
index 0916b21..126c8dd 100644 (file)
--- a/adaptor/shop-adaptor/shop-adaptor.c
+++ b/adaptor/shop-adaptor/shop-adaptor.c
@@ -240,8 +240,16 @@ int shop_adaptor_register_listener(shop_adaptor_h adaptor, shop_adaptor_listener
 EXPORT_API
 int shop_adaptor_unregister_listener(shop_adaptor_h adaptor, shop_adaptor_listener_h listener)
 {
-       if ((NULL == adaptor) || (NULL == listener)) {
-               shop_adaptor_error("Invalid argument");
+       if (NULL == adaptor)  {
+               shop_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return SHOP_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               shop_adaptor_error("Invalid argument (listener)");
                return SHOP_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/adaptor/storage-adaptor/storage-adaptor.c b/adaptor/storage-adaptor/storage-adaptor.c
index c290af6..e8bad2e 100644 (file)
--- a/adaptor/storage-adaptor/storage-adaptor.c
+++ b/adaptor/storage-adaptor/storage-adaptor.c
@@ -717,8 +717,16 @@ int storage_adaptor_register_listener(storage_adaptor_h adaptor,
 int storage_adaptor_unregister_listener(storage_adaptor_h adaptor,
                                                storage_adaptor_listener_h listener)
 {
-       if ((NULL == adaptor) || (NULL == listener)) {
-               storage_adaptor_error("Invalid argument""(adaptor: %p, listener: %p)", adaptor, listener);
+       if (NULL == adaptor)  {
+               storage_adaptor_error("Invalid argument (adaptor)");
+               if (NULL != listener) {
+                       free(listener);
+                       listener = NULL;
+               }
+               return STORAGE_ADAPTOR_ERROR_INVALID_ARGUMENT;
+       }
+       if (NULL == listener) {
+               storage_adaptor_error("Invalid argument (listener)");
                return STORAGE_ADAPTOR_ERROR_INVALID_ARGUMENT;
        }
 

diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index b7847a0..f6361cf 100644 (file)
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -1,6 +1,6 @@
 Name:       service-adaptor
 Summary:    Service Adaptor Framework for Convergence
-Version:    1.2.1
+Version:    1.2.2
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0