Changeset 473 for trunk/src

Timestamp:

May 29, 2015, 10:42:18 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #371 (use cppcheck instead of uno for static checking).

Location:

trunk/src

Files:

• samhain.c (modified) (1 diff)
• sh_calls.c (modified) (1 diff)
• sh_entropy.c (modified) (1 diff)
• sh_html.c (modified) (1 diff)
• sh_portcheck.c (modified) (1 diff)
• sh_srp.c (modified) (1 diff)
• sh_static.c (modified) (1 diff)
• sh_unix.c (modified) (2 diffs)
• sh_utils.c (modified) (1 diff)
• slib.c (modified) (2 diffs)

trunk/src/samhain.c

@@ -156 +156 @@
   ptr->g_glob     = calloc(1, SH_MAX_GLOBS * (GLOB_LEN+1));
   if (!(ptr->g_glob))
-    return -1;
+    {
+      free(ptr);
+      return -1;
+    }
   return pthread_setspecific(g_key, ptr);
 }

trunk/src/sh_calls.c

@@ -200 +200 @@
   error = errno;
   if (val_retry != 0) {
-    long eport;
+    long eport = 0;
     char eaddr[SH_IP_BUF];
     char emesg[SH_BUFSIZE];

trunk/src/sh_entropy.c

@@ -640 +640 @@
       }
       
+      /* cppcheck-suppress leakNoVarFunctionCall */
       if (NULL != freopen (_("/dev/null"), "r+", stderr))
         {

trunk/src/sh_html.c

@@ -311 +311 @@
           if (entry_orig != NULL)
             {
-              entry_orig = realloc(entry_orig,           /* free() ok     */
+              char * ptr = realloc(entry_orig,           /* free() ok     */
                                    entry_size + line_size + 1);
-              if (entry_orig) { add_size = line_size; }
+              if (ptr) {
+                entry_orig = ptr;
+                add_size = line_size; 
+              } else {
+                { free(entry_orig); entry_orig = NULL; }
+              }
             }
           else

trunk/src/sh_portcheck.c

@@ -1688 +1688 @@
                                                  char * interface, int type)
 {
-  char buf[256];
+  char buf[256] = { '\0' };
   int proto;
   char * p;

trunk/src/sh_srp.c

@@ -114 +114 @@
       size = strlen(str) + 1;
       if (size > siz_str_internal)
-        get_str_internal = realloc (get_str_internal, size);
+        {
+          char * ptr = realloc (get_str_internal, size);
+          if (ptr)
+            get_str_internal = ptr;
+          else
+            { free(get_str_internal); get_str_internal = NULL; }
+        }
       if (get_str_internal == NULL)
         {

trunk/src/sh_static.c

@@ -1641 +1641 @@
         ; /* 'label at end of compound statement' */
         SH_MUTEX_UNLOCK(resolv_lock);
+        /* cppcheck-suppress resourceLeak */
         return 0;
 }

trunk/src/sh_unix.c

@@ -1504 +1504 @@
     if (env1[envlen] == NULL)
       {
+        int i;
         fprintf(stderr, _("%s: %d: Out of memory\n"), FIL__, __LINE__);
+        for (i = 0; i < envlen; ++i) free(env1[len]);
+        free(env1);
         SL_RET0(_("sh_unix_copyenv"));
       }
@@ -5672 +5675 @@
 
   sigtrap_variables->not_traced = signum;
+  /* cppcheck-suppress memleak */
   return;
 }

trunk/src/sh_utils.c

@@ -1315 +1315 @@
   while (0 < (ii = sl_read (fp, &image[s], 4096)))
     {
+      unsigned char * ptr;
       ilen += ii;
       s    += 4096;
-      image = realloc (image, (size_t) (4096 + s));
+      ptr = realloc (image, (size_t) (4096 + s));
+      if (ptr)
+        image = ptr;
+      else
+        { free(image); image = NULL; }
       if (!image)
         goto bail_mem;

trunk/src/slib.c

@@ -1738 +1738 @@
   /* Make entry.
    */
+  /* cppcheck-suppress arrayIndexOutOfBoundsCond */
   if (fd >= MAXFD || fd < 0)
      {
@@ -2010 +2011 @@
   /* Make entry.
    */
+  /* cppcheck-suppress arrayIndexOutOfBoundsCond */
   if (fd >= MAXFD)
      {