Remove redundant check for free()

Change-Id: Ia984f59474bdf3731b01720054527c9dacaa56af

diff --git a/src/common/dbus_service.cc b/src/common/dbus_service.cc
index d03203c418f25f23867e8cd0b0fffad20ff9063e..1217418448fd7b421f5f0514cfee077de76bd235 100644 (file)
--- a/src/common/dbus_service.cc
+++ b/src/common/dbus_service.cc
@@ -102,18 +102,15 @@ SecurityManager::Credentials GetCredentials(
   ret = cynara_creds_gdbus_get_client(conn, sender, CLIENT_METHOD_DEFAULT,
           &client);
   if (ret != CYNARA_API_SUCCESS) {
-    if (user)
-      free(user);
+    free(user);
     LOG(ERROR) << "cynara_creds_gdbus_get_client() failed: " << ret;
     return SecurityManager::Credentials();
   }
 
   ret = cynara_creds_gdbus_get_pid(conn, sender, &pid);
   if (ret != CYNARA_API_SUCCESS) {
-    if (user)
-      free(user);
-    if (client)
-      free(client);
+    free(user);
+    free(client);
     LOG(ERROR) << "cynara_creds_gdbus_get_pid() failed: " << ret;
     return SecurityManager::Credentials();
   }

diff --git a/src/common/security_manager.cc b/src/common/security_manager.cc
index 64c7e4fdd856235067137ce6948828b6576dc813..f91c6b6b4b2206e94b8abdeafd8bf566eb9d287d 100644 (file)
--- a/src/common/security_manager.cc
+++ b/src/common/security_manager.cc
@@ -33,11 +33,8 @@ SecurityManager::Credentials::Credentials(int pid, const char* user,
 }\r
 \r
 SecurityManager::Credentials::~Credentials() {\r
-  if (smack_label_)\r
-    free(smack_label_);\r
-\r
-  if (user_)\r
-    free(user_);\r
+  free(smack_label_);\r
+  free(user_);\r
 }\r
 \r
 bool SecurityManager::Credentials::IsInit() const {\r