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 c0c118bcf8b65fab6de7d9bc0f0bd285874f6638..fa8b783cf05400c203415d8f11d267fd66a9fdcb 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 368eae5ff0e33c74cc9b895efa16a3c2e66bdfb8..7b3315a8b72cd66de74c35bc16cc9632f8f49c1a 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 fd9f617dcd06301e3e61fab57c8e34b7969f9117..fd7d2c31af5ee3bb2af25bfb4d9d2e1958283fb7 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 d93ff8208af29cd5d0840bfd38287744dcb33e8d..b5621867be021a5162b7ea69f709da03f3870893 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 0916b21f6110c4cff153aca435d4f74e5df41234..126c8dde6e42a32552744f377d42102ada213099 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 c290af60408aa7cef7b45beb7a589d2450901699..e8bad2efa46b71619b085cd652c8ea7107f6f488 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 b7847a089be818e377ba2d6f8c33c7b95ce2398e..f6361cf256941d736b5f3cb3771cf6e2270c2be0 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