Changeset 590

Timestamp:

Oct 27, 2025, 6:57:03 PM (6 hours ago)

Author:

katerina

Message:

Fix for ticket #478 (cppcheck warnings).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/rijndael-api-fst.c (modified) (1 diff)
• src/sh_files.c (modified) (3 diffs)
• src/sh_hash.c (modified) (1 diff)
• src/sh_log_parse_pacct.c (modified) (1 diff)
• src/sh_portcheck.c (modified) (1 diff)
• src/sh_registry.c (modified) (2 diffs)
• src/sh_suidchk.c (modified) (13 diffs)
• src/sh_unix.c (modified) (3 diffs)
• src/sh_utils.c (modified) (1 diff)
• src/sh_xfer_server.c (modified) (2 diffs)
• test/testrun_1f.sh (modified) (1 diff)
• test/testrun_2g.sh (modified) (2 diffs)

trunk/configure.ac

@@ -4 +4 @@
 dnl AU_ALIAS([_AC_INIT_help], [SH_INIT_HELP])
 
-AC_INIT([samhain],[4.5.2])
+AC_INIT([samhain],[4.5.3])
 AC_CONFIG_SRCDIR(src/samhain.c)
 

trunk/docs/Changelog

@@ -7 +7 @@
         * move logfile monitor module from PCRE to PCRE2 (PCRE is end of life and no
         longer actively maintained)
+        * fix obsolete gpg option --secret-keyring used in samhainadmin script
+        * fix some more warnings, mostly false positives from cppcheck
 
 4.5.2 (02-01-2025):

trunk/src/rijndael-api-fst.c

@@ -103 +103 @@
 
                 /* memcpy(key->keyMaterial, keyMaterial, keyLen/8); */
+                /* cppcheck-suppress uninitvar */
                 memcpy(key->keyMaterial, temp, keyLen/8);
         }

trunk/src/sh_files.c

@@ -338 +338 @@
     here = (dirstack_t *) inptr;
 
+  /* cppcheck-suppress uninitStructMember */
   if (here->name != NULL)
     SH_FREE(here->name);
@@ -892 +893 @@
 static int sh_files_parse_mask (unsigned long * mask, const char * str)
 {
-  int l, i = 0, act = 0, k = 0;
+  int l = 0, i = 0, act = 0, k = 0;
   char  myword[64];
   
@@ -1396 +1397 @@
     here = (sh_globstack_t *) inptr;
 
+  /* cppcheck-suppress uninitStructMember */
   if (here->name != NULL)
     SH_FREE(here->name);

trunk/src/sh_hash.c

@@ -1287 +1287 @@
 #if defined(__linux__) || defined(HAVE_STAT_FLAGS)
   p.attributes  = (UINT32) buf->attributes;
+#else
+  p.attributes  = (UINT32) 0;
 #endif
   p.linkmode    = (UINT32) buf->linkmode;

trunk/src/sh_log_parse_pacct.c

@@ -252 +252 @@
       
 #if defined(ac_flagx)
+      /* cppcheck-suppress syntaxError */
       expand_flags(rec.ac_flagx, fl);
 #else

trunk/src/sh_portcheck.c

@@ -957 +957 @@
   int                retval;
   char             * p = NULL;
-  char               buf[8];
+  char               buf[8] = { 0 };
 #ifndef TEST_ONLY
   char               errmsg[256];

trunk/src/sh_registry.c

@@ -905 +905 @@
                                qError,
                                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                               /* cppcheck-suppress uninitvar */
                                (LPTSTR) &lpMsgBuf,
                                0, NULL );
@@ -1007 +1008 @@
 
   /* Returns 0 if !subkey */
-  /* cppcheck-suppress uninitvar */
+  /* cppcheck-suppress legacyUninitvar */
   return CheckThisSubkey (topKey, subkey, path, isSingle, 0);
 }

trunk/src/sh_suidchk.c

@@ -1019 +1019 @@
   SL_ENTER(_("sh_suidchk_check_internal"));
 
+  if (iname == NULL)
+    {
+      TPT((0, FIL__, __LINE__ , _("msg=<directory name is NULL>\n")));
+      SL_RETURN( (-1), _("sh_suidchk_check_internal"));
+    }
+
+  if (sig_urgent > 0) {
+    SL_RETURN( (0), _("sh_suidchk_check_internal"));
+  }
+
   /* Take the address to keep gcc from putting it into a register. 
    * Avoids the 'clobbered by longjmp' warning. 
@@ -1024 +1034 @@
   sh_dummy_idirlist = (void*) &dirlist;
   sh_dummy_itmp     = (void*) &tmp;
-
-  if (iname == NULL)
-    {
-      TPT((0, FIL__, __LINE__ , _("msg=<directory name is NULL>\n")));
-      SL_RETURN( (-1), _("sh_suidchk_check_internal"));
-    }
-
-  if (sig_urgent > 0) {
-    SL_RETURN( (0), _("sh_suidchk_check_internal"));
-  }
 
   thisDir = opendir (iname);
@@ -1047 +1047 @@
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
       SH_FREE(tmp);
+      sh_dummy_idirlist = NULL;
+      sh_dummy_itmp     = NULL;
       SL_RETURN( (-1), _("sh_suidchk_check_internal"));
     }
@@ -1412 +1414 @@
   kill_sh_dirlist (dirlist_orig);
 
+  sh_dummy_idirlist = NULL;
+  sh_dummy_itmp     = NULL;
+
   SL_RETURN( (0), _("sh_suidchk_check_internal"));
 }
@@ -2193 +2198 @@
    Return "unknown" if its filesystem type is unknown.  */
 
-static char *
-filesystem_type (char * path, char * relpath, struct stat * statp)
+static char * filesystem_type (char * path, char * relpath, struct stat * statp)
 {
   static char *current_fstype = NULL;
@@ -2218 +2222 @@
 void * sh_dummy_2229_type;
 
-static char *
-filesystem_type_uncached (path, relpath, statp)
-     char *path;
-     char *relpath;
-     struct stat *statp;
+static char * filesystem_type_uncached (char * path, char * relpath, struct stat * statp)
 {
   char * type = NULL;
@@ -2234 +2234 @@
   struct mntent *mnt;
 
+  if (path == NULL || relpath == NULL)
+    return NULL;
+
   /* Take the address to keep gcc from putting it into a register. 
    * Avoids the 'clobbered by longjmp' warning. 
    */
   sh_dummy_2229_type = (void *) &type;
-
-  if (path == NULL || relpath == NULL)
-    return NULL;
 
   mfp = setmntent (table, "r");
@@ -2250 +2250 @@
                        _("filesystem_type_uncached") );
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
+      sh_dummy_2229_type = NULL;
       return NULL;
     }
@@ -2378 +2379 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2406 +2408 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2453 +2456 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2492 +2496 @@
   fstype_known = (int)(type != NULL);
 
+  sh_dummy_2229_type = NULL;
   return sh_util_strdup (type ? type : "unknown");
 }
@@ -2500 +2505 @@
    part of CP. */
 
-static int
-xatoi (cp)
-     const char *cp;
+static int xatoi (const char * cp)
 {
   int val;

trunk/src/sh_unix.c

@@ -17 +17 @@
 /*  along with this program; if not, write to the Free Software            */
 /*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.              */
+
+/* cppcheck-suppress-file unknownMacro */
 
 #include "config_xor.h"
@@ -2412 +2414 @@
   char          AsciiTime[81];                       /* local time   */
   time_t        time_now;
-  struct tm   * time_ptr;
+  struct tm   * time_ptr = NULL;
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
   struct tm     time_tm;
@@ -2546 +2548 @@
 #endif
     }
+
   if (time_ptr != NULL) 
     {

trunk/src/sh_utils.c

@@ -769 +769 @@
   char        K[KEY_BLOCK];
   char        outer[KEY_BLOCK];
-  char      * inner;
+  char      * inner = NULL;
   UINT32    * h1;
   UINT32    * h2;

trunk/src/sh_xfer_server.c

@@ -484 +484 @@
     here = (client_t *) inptr;
 
+  /* cppcheck-suppress uninitStructMember */
   if (here->hostname != NULL)
     SH_FREE(here->hostname);
@@ -506 +507 @@
     here = (alias_t *) inptr;
 
+  /* cppcheck-suppress uninitStructMember */
   if (here->alias != NULL)
     SH_FREE(here->alias);

trunk/test/testrun_1f.sh

@@ -63 +63 @@
 prep_sign_file ()
 {
-    scripts/samhainadmin.pl -s ./test/gnupg/ -m R $1 >/dev/null
-    scripts/samhainadmin.pl -s ./test/gnupg/ -k 8A0B337A -m E $1 >/dev/null
+    scripts/samhainadmin.pl  -m R $1 >/dev/null
+    scripts/samhainadmin.pl  -k 8A0B337A -m E $1 >/dev/null
 }
 

trunk/test/testrun_2g.sh

@@ -336 +336 @@
         UUID=$(uuidgen)
         if [ x"$1" != "xnosig" ]; then
-            scripts/samhainadmin.pl -s ./test/gnupg/ -k 8A0B337A -m E ./file.delta >/dev/null
+            scripts/samhainadmin.pl -k 8A0B337A -m E ./file.delta >/dev/null
         fi
         if [ x"$1" == "xnodelta" ]; then
@@ -612 +612 @@
 testrun2g_signrc ()
 {
-    scripts/samhainadmin.pl -s ./test/gnupg/ -m R $1 >/dev/null
-    scripts/samhainadmin.pl -s ./test/gnupg/ -k 8A0B337A -m E $1 >/dev/null
+    scripts/samhainadmin.pl  -m R $1 >/dev/null
+    scripts/samhainadmin.pl  -k 8A0B337A -m E $1 >/dev/null
 }
 
 testrun2g_signdb ()
 {
-    scripts/samhainadmin.pl -s ./test/gnupg/ -k 8A0B337A -m E ./.samhain_file >/dev/null
+    scripts/samhainadmin.pl  -k 8A0B337A -m E ./.samhain_file >/dev/null
 }