Merge pull request #428 from ArnoStiefvater/fix-compiler-warnings

Fix static code analysis warnings
greenbone · Jan 26, 2021 · d93a4d3 · d93a4d3
2 parents 6f1552a + 1533c00
commit d93a4d3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/base/logging.c b/base/logging.c
@@ -480,7 +480,8 @@ gvm_log_func (const char *log_domain, GLogLevelFlags log_level,
               log_domain_entry = entry;
 
               /* Get the struct contents. */
-              prepend_format = log_domain_entry->prepend_string;
+              if (log_domain_entry->prepend_string)
+                prepend_format = log_domain_entry->prepend_string;
               time_format = log_domain_entry->prepend_time_format;
               log_file = log_domain_entry->log_file;
               if (log_domain_entry->default_level)

diff --git a/base/networking.c b/base/networking.c
@@ -850,8 +850,10 @@ ip_islocalhost (struct sockaddr_storage *storage)
           if (ifa->ifa_addr->sa_family == AF_INET6)
             {
               sin6 = (struct sockaddr_in6 *) (ifa->ifa_addr);
+
               /* Check if same address as local interface. */
-              if (IN6_ARE_ADDR_EQUAL (&(sin6->sin6_addr), addr6_p))
+              if (family == AF_INET6
+                  && IN6_ARE_ADDR_EQUAL (&(sin6->sin6_addr), addr6_p))
                 return TRUE;
             }
         }

diff --git a/boreas/boreas_io.c b/boreas/boreas_io.c
@@ -198,17 +198,18 @@ get_host_from_queue (kb_t alive_hosts_kb, gboolean *alive_deteciton_finished)
       else
         {
           host = gvm_host_from_str (host_str);
-          g_free (host_str);
 
           if (!host)
             {
               g_warning ("%s: Could not transform IP string \"%s\" into "
                          "internal representation.",
                          __func__, host_str);
+              g_free (host_str);
               return NULL;
             }
           else
             {
+              g_free (host_str);
               return host;
             }
         }

diff --git a/osp/osp.c b/osp/osp.c
@@ -146,14 +146,18 @@ osp_connection_new (const char *host, int port, const char *cacert,
       connection = g_malloc0 (sizeof (*connection));
       connection->socket = socket (AF_UNIX, SOCK_STREAM, 0);
       if (connection->socket == -1)
-        return NULL;
+        {
+          g_free (connection);
+          return NULL;
+        }
 
       addr.sun_family = AF_UNIX;
       strncpy (addr.sun_path, host, sizeof (addr.sun_path) - 1);
       len = strlen (addr.sun_path) + sizeof (addr.sun_family);
       if (connect (connection->socket, (struct sockaddr *) &addr, len) == -1)
         {
           close (connection->socket);
+          g_free (connection);
           return NULL;
         }
     }

diff --git a/util/kb.c b/util/kb.c
@@ -446,6 +446,7 @@ redis_direct_conn (const char *kb_path, const int kb_index)
         freeReplyObject (rep);
       redisFree (kbr->rctx);
       kbr->rctx = NULL;
+      g_free (kbr);
       return NULL;
     }
   freeReplyObject (rep);

diff --git a/util/serverutils.c b/util/serverutils.c
@@ -1257,14 +1257,23 @@ set_gnutls_dhparams (gnutls_certificate_credentials_t creds,
 
   if (load_gnutls_file (dhparams_file, &data))
     return -1;
+
+/* Disable false positive warning about potential leak of memory */
+#ifndef __clang_analyzer__
+
   gnutls_dh_params_t params = g_malloc0 (sizeof (gnutls_dh_params_t));
   ret = gnutls_dh_params_import_pkcs3 (params, &data, GNUTLS_X509_FMT_PEM);
   unload_gnutls_file (&data);
   if (ret)
-    return -1;
+    {
+      g_free (params);
+      return -1;
+    }
   else
     gnutls_certificate_set_dh_params (creds, params);
   return 0;
+
+#endif
 }
 
 /**