Changeset 570 for trunk

Timestamp:

Sep 5, 2021, 12:40:51 PM (3 years ago)

Author:

katerina

Message:

Fixes for some compile/cppcheck warnings, version 4.4.6.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/bignum.c (modified) (1 diff)
• src/sh_extern.c (modified) (1 diff)
• src/sh_hash.c (modified) (1 diff)
• src/sh_static.c (modified) (4 diffs)
• src/sh_unix.c (modified) (1 diff)
• src/sh_utils.c (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.4.5)
+AM_INIT_AUTOMAKE(samhain, 4.4.6)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+4.4.6:
+        * fix Debian 10 compile problem in dnmalloc (mallinfo2),
+        reported by A. Hofland and others
+        * fix compile problem on Ubuntu 20 with 'make deb'
+        (Debian optimization CFLAGS clash with ASM for Tiger)
+        * fix 'make deb' issue when compiling as client
+        (reported by A. Hofland)
+        * fix issue with inotify (reported by Thorsten)
+
 4.4.5:
         * fix a memory leak introduced in 4.4.4
-        
+
 4.4.4:
         * fix more gcc 10 compiler warnings

trunk/src/bignum.c

@@ -175 +175 @@
     for (base = 2; base <= 36; base++)
     {
-        tmp = ((1 << (DIGIT_BITS - 1)) / base);
+        tmp = ((1U << (DIGIT_BITS - 1)) / base);
         maxdigit = tmp * 2;
         curdigit = 1;

trunk/src/sh_extern.c

@@ -993 +993 @@
         if (sh_string_len(s) == 0)
           {
+            /* cppcheck-suppress syntaxError */
             --try; retry_msleep(0, 100);
           }

trunk/src/sh_hash.c

@@ -2031 +2031 @@
                                        sl_strlen(theFile->link_path),
                                        hashbuf, sizeof(hashbuf)), 
-                         MAX_PATH_STORE+1);
+                         sizeof(linkHash));
               linkComp = linkHash;
               maxcomp  = KEY_LEN;

trunk/src/sh_static.c

@@ -464 +464 @@
 {
         FILE *grf;
-        gid_t *group_list;
-        int num_groups, rv;
+        gid_t *group_list = NULL;
+        size_t num_groups;
+        int rv;
         char **m;
         struct group group;
@@ -474 +475 @@
 
         /* We alloc space for 8 gids at a time. */
-        if (((group_list = calloc(8,sizeof(gid_t *))) != NULL)
+        if (buff && ((group_list = calloc(8,sizeof(gid_t *))) != NULL)
                 && ((grf = fopen(_PATH_GROUP, "r")) != NULL)
                 ) {
@@ -489 +490 @@
                                         if (!strcmp(*m, user)) {
                                                 if (!(num_groups & 7)) {
-                                                        gid_t *tmp = (gid_t *)
-                                                                realloc(group_list,
-                                                                                (num_groups+8) * sizeof(gid_t *));
-                                                        if (!tmp) {
-                                                                rv = -1;
-                                                                goto DO_CLOSE;
-                                                        }
-                                                        group_list = tmp;
+                                                  gid_t *tmp = NULL;
+                                                  if (num_groups > (SIZE_MAX - 8)) {
+                                                    rv = -1;
+                                                    goto DO_CLOSE;
+                                                  }
+                                                  if ((num_groups+8) <= (SIZE_MAX / sizeof(gid_t *))) {
+                                                    tmp = (gid_t *)
+                                                      realloc(group_list,
+                                                              (num_groups+8) * sizeof(gid_t *));
+                                                  } 
+                                                  if (!tmp) {
+                                                    rv = -1;
+                                                    goto DO_CLOSE;
+                                                  }
+                                                  group_list = tmp;
                                                 }
                                                 group_list[num_groups++] = group.gr_gid;
@@ -512 +520 @@
         /* group_list will be NULL if initial malloc failed, which may trigger
          * warnings from various malloc debuggers. */
-        free(group_list);
-        free(buff);
+        if (group_list) free(group_list);
+        if (buff) free(buff);
+        /* cppcheck-suppress resourceLeak */
         return rv;
 }

trunk/src/sh_unix.c

@@ -3904 +3904 @@
           if (errno == EBADF && try == 0) /* obsolete, but we keep this, just in case */
             {
+              /* cppcheck-suppress syntaxError */
               ++try;
               goto try_again;

trunk/src/sh_utils.c

@@ -1246 +1246 @@
     }
 
-  if (NULL == (new = calloc(1,strlen(new_in) + 1)))
+  len = strlen(new_in) + 1;
+  if (NULL == (new = calloc(1, len)))
     goto bail_mem;
-  sl_strncpy(new, new_in, strlen(new_in) + 1);
+  memcpy(new, new_in, len);
 
   key = new;