Changeset 592

Timestamp:

Oct 31, 2026, 7:16:07 PM (18 hours ago)

Author:

katerina

Message:

Fixes for compiler warnings.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/bignum.c (modified) (33 diffs)
• src/dnmalloc.c (modified) (1 diff)
• src/sh_checksum.c (modified) (3 diffs)
• src/sh_error.c (modified) (2 diffs)
• src/sh_filetype.c (modified) (1 diff)
• src/sh_hash.c (modified) (2 diffs)
• src/sh_log_check.c (modified) (1 diff)
• src/sh_login_track.c (modified) (1 diff)
• src/sh_mem.c (modified) (5 diffs)
• src/sh_port2proc.c (modified) (1 diff)
• src/sh_portcheck.c (modified) (6 diffs)
• src/sh_processcheck.c (modified) (3 diffs)
• src/sh_sig.c (modified) (5 diffs)
• src/sh_socket.c (modified) (2 diffs)
• src/sh_static.c (modified) (1 diff)
• src/sh_string.c (modified) (5 diffs)
• src/sh_suidchk.c (modified) (2 diffs)
• src/sh_xfer_client.c (modified) (1 diff)
• src/slib.c (modified) (3 diffs)
• src/trustfile.c (modified) (4 diffs)
• src/yulectl.c (modified) (1 diff)
• test/testrun_1.sh (modified) (1 diff)
• test/testrun_1a.sh (modified) (1 diff)
• test/testrun_1b.sh (modified) (1 diff)
• test/testrun_1i.sh (modified) (1 diff)

trunk/configure.ac

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

trunk/docs/Changelog

@@ -1 @@
-4.5.3:
+4.5.4 (31-10-2026):
+        * fix a slew of compiler warnings with gcc 15.2.0
+        * fix some cppcheck warnings (mostly false positives)
+        * modify test script for the case that the utmp file doesn't exist
+
+4.5.3 (31-10-2025):
         * fix inadvertent inclusion of scripts/logrotate and init/samhain.startSystemd
         (reported by kjd)

trunk/src/bignum.c

@@ -649 +649 @@
 
 bigerr_t
-big_create(a)
-bignum *a;
+big_create(bignum * a)
 {
   /* Make sure that big_create alway returns a NULL bignum
@@ -681 +680 @@
 
 void
-big_destroy(a)
-bignum *a;
+big_destroy(bignum *a)
 {
   /* Mar 4, 2000 R. Wichmann: check for a == NULL */
@@ -691 +689 @@
 
 ulong
-big_bitcount(a)
-bignum *a;
+big_bitcount(bignum *a)
 {
     int bits = 0;
@@ -711 +708 @@
 
 bigerr_t
-big_set_big(a, b)
-bignum *a;
-bignum *b;
+big_set_big(bignum *a, bignum *b)
 {
     if ((big_errno != BIG_OK) || (a == b))
@@ -731 +726 @@
 
 void
-big_set_ulong(n, a)
-ulong n;
-bignum *a;
+big_set_ulong(ulong n, bignum *a)
 {
     unsigned int i;
@@ -766 +759 @@
 
 void
-big_set_long(n, a)
-long n;
-bignum *a;
+big_set_long(long n, bignum *a)
 {
     ulong m;
@@ -782 +773 @@
 
 bigerr_t
-big_set_string(numstr, base, a)
-char *numstr;
-int base;
-bignum *a;
+big_set_string(char * numstr, int base, bignum *a)
 {
     char *src, *maxdigit, *chrptr;
@@ -870 +858 @@
 
 int
-big_ulong(a, n)
-bignum *a;
-ulong *n;
+big_ulong(bignum *a, ulong *n)
 {
     ulong old_n;
@@ -900 +886 @@
 
 int
-big_long(a, n)
-bignum *a;
-long *n;
+big_long(bignum *a, long *n)
 {
     long old_n;
@@ -931 +915 @@
 
 char *
-big_string(a, base)
-bignum *a;
-int base;
+big_string(bignum *a, int base)
 {
     ulong bit_length, str_length;
@@ -993 +975 @@
 
 bigerr_t
-big_negate(a, b)
-bignum *a;
-bignum *b;
+big_negate(bignum *a, bignum *b)
 {
     big_set_big(a, b);
@@ -1003 +983 @@
 
 int
-big_sign(a)
-bignum *a;
+big_sign(bignum *a)
 {
     return a->sign;
@@ -1010 +989 @@
 
 bigerr_t
-big_abs(a, b)
-bignum *a;
-bignum *b;
+big_abs(bignum *a, bignum *b)
 {
     big_set_big(a, b);
@@ -1023 +1000 @@
 
 int
-big_compare(a, b)
-bignum *a;
-bignum *b;
+big_compare(bignum *a, bignum *b)
 {
     if (a->sign == b->sign)
@@ -1042 +1017 @@
 
 int
-big_lessp(a, b)
-bignum *a;
-bignum *b;
+big_lessp(bignum *a, bignum *b)
 {
     return big_compare(a, b) < 0;
@@ -1050 +1023 @@
 
 int
-big_leqp(a, b)
-bignum *a;
-bignum *b;
+big_leqp(bignum *a, bignum *b)
 {
     return !(big_compare(a, b) > 0);
@@ -1058 +1029 @@
 
 int
-big_equalp(a, b)
-bignum *a;
-bignum *b;
+big_equalp(bignum *a, bignum *b)
 {
     return big_compare(a, b) == 0;
@@ -1066 +1035 @@
 
 int
-big_geqp(a, b)
-bignum *a;
-bignum *b;
+big_geqp(bignum *a, bignum *b)
 {
     return !(big_compare(a, b) < 0);
@@ -1074 +1041 @@
 
 int
-big_greaterp(a, b)
-bignum *a;
-bignum *b;
+big_greaterp(bignum *a, bignum *b)
 {
     return big_compare(a, b) > 0;
@@ -1082 +1047 @@
 
 int
-big_zerop(a)
-bignum *a;
+big_zerop(bignum *a)
 {
     return a->sign == BIG_SIGN_0;
@@ -1089 +1053 @@
 
 int
-big_evenp(a)
-bignum *a;
+big_evenp(bignum *a)
 {
     return ((*a->dp & 0x01) == 0);
@@ -1096 +1059 @@
 
 int
-big_oddp(a)
-bignum *a;
+big_oddp(bignum *a)
 {
     return ((*a->dp & 0x01) == 1);
@@ -1103 +1065 @@
 
 bigerr_t
-big_add(a, b, c)
-bignum *a;
-bignum *b;
-bignum *c;
+big_add(bignum *a, bignum *b, bignum *c)
 {
     int cmp;
@@ -1160 +1119 @@
 
 bigerr_t
-big_sub(a, b, c)
-bignum *a;
-bignum *b;
-bignum *c;
+big_sub(bignum *a, bignum *b, bignum *c)
 {
     int cmp;
@@ -1225 +1181 @@
 
 bigerr_t
-big_mul(a, b, c)
-bignum *a;
-bignum *b;
-bignum *c;
+big_mul(bignum *a, bignum *b, bignum *c)
 {
     DIGIT *dp_x, *dp_xstart, *dp_xend;
@@ -1350 +1303 @@
 
 bigerr_t
-big_trunc(a, b, q, r)
-bignum *a;
-bignum *b;
-bignum *q;
-bignum *r;
+big_trunc(bignum *a, bignum *b, bignum *q, bignum *r)
 {
     DIGIT *v_end, *q_end, *r_end, *src, *dst;
@@ -1598 +1547 @@
 
 bigerr_t
-big_floor(a, b, q, r)
-bignum *a;
-bignum *b;
-bignum *q;
-bignum *r;
+big_floor(bignum *a, bignum *b, bignum *q, bignum *r)
 {
     int b_eq_qr, sign_eq;
@@ -1633 +1578 @@
 
 bigerr_t
-big_ceil(a, b, q, r)
-bignum *a;
-bignum *b;
-bignum *q;
-bignum *r;
+big_ceil(bignum *a, bignum *b, bignum *q, bignum *r)
 {
     int b_eq_qr, sign_diff;
@@ -1671 +1612 @@
  */
 bigerr_t
-big_round(a, b, q, r)
-bignum *a;
-bignum *b;
-bignum *q;
-bignum *r;
+big_round(bignum *a, bignum *b, bignum *q, bignum *r)
 {
     int b_eq_qr, b_neg_p, a_sgn_neq_b_sgn;
@@ -1740 +1677 @@
 
 bigerr_t
-big_random(a, b)
-bignum *a;
-bignum *b;
+big_random(bignum *a, bignum *b)
 {
     unsigned long i;
@@ -1791 +1726 @@
 
 int
-big_expt(a, z, x)
-bignum *a;
-unsigned long z;
-bignum *x;
+big_expt(bignum *a, unsigned long z, bignum *x)
 {
     bignum b;
@@ -1821 +1753 @@
 
 int
-big_exptmod(a_in, z_in, n, x)
-bignum *a_in;
-bignum *z_in;
-bignum *n;
-bignum *x;
+big_exptmod(bignum *a_in, bignum *z_in, bignum *n, bignum *x)
 {
     bignum a, z, b0, b1, b2, dummy;
@@ -1870 +1798 @@
 
 int
-big_gcd(a, b, g)
-bignum *a;
-bignum *b;
-bignum *g;
+big_gcd(bignum *a, bignum *b, bignum *g)
 {
     bignum a1, b1, tmp;

trunk/src/dnmalloc.c

@@ -822 +822 @@
  * it may actually raise an error.
  */
+/* cppcheck-suppress syntaxError */
 #if defined(HAVE_MALLOC_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 33)
 #include <malloc.h>

trunk/src/sh_checksum.c

@@ -525 +525 @@
   *buffer = (char)0;
 
+  /* cppcheck-suppress uninitvar */
   return hexdigest;
 }
@@ -531 +532 @@
 {
   char   keybuf[KEYBUF_SIZE];
-  char * s   = strstr(str, before);
+  const char * s   = strstr(str, before);
 
   if (s)
     {
       char * p;
+      const char * p1;
 
       s += strlen(before);
@@ -555 +557 @@
           strcpy(r, hexbuf); /* flawfinder: ignore */
           r += strlen(hexbuf);
-          p = strchr(s, after);
-          strcpy(r, p);      /* flawfinder: ignore */
+          p1 = strchr(s, after);
+          strcpy(r, p1);      /* flawfinder: ignore */
 
           return ret;

trunk/src/sh_error.c

@@ -1744 +1744 @@
     {
       /* use VA_COPY */
+      /* cppcheck-suppress va_list_usedBeforeStarted */
+      /* cppcheck-suppress syntaxError */
       /*@i@*/VA_COPY(vl2, vl);
       len      = sl_strlen(lmsg->msg);
@@ -1759 +1761 @@
           lmsg->msg = p;
           lmsg->msg_len = required + len + 4;
-          (void) sl_vsnprintf(&(lmsg->msg[len]), 
-                              (required + 1), lmsg->format, vl2);
+          /* cppcheck-suppress uninitvar */
+          /* cppcheck-suppress va_list_usedBeforeStarted */
+          (void) sl_vsnprintf(&(lmsg->msg[len]), (required + 1), lmsg->format, vl2);
         }
+      /* cppcheck-suppress va_list_usedBeforeStarted */
       va_end(vl2);
     }

trunk/src/sh_filetype.c

@@ -486 +486 @@
         }
     }
-  sh_ftype_arr[nn] = NULL;
-  sh_ftype_nn      = nn;
+  if (sh_ftype_arr) {
+    sh_ftype_arr[nn] = NULL;
+    sh_ftype_nn      = nn;
+  }
 
   return;

trunk/src/sh_hash.c

@@ -3018 +3018 @@
 {
   char * r = result;
+  
+  *r = '\0'; /* return empty string if !s */
+  
   if (s)
     {
@@ -3026 +3029 @@
       *r = '\0';
     }
+  /* cppcheck-suppress uninitvar */
   return result;
 }

trunk/src/sh_log_check.c

@@ -423 +423 @@
           if (S_ISREG(buf.st_mode)
 #ifdef S_ISLNK
+              /* cppcheck-suppress syntaxError */
               || S_ISLNK(buf.st_mode)
 #endif 

trunk/src/sh_login_track.c

@@ -168 +168 @@
 static int get_bool(char *bitarray, unsigned int index)
 {
-  int bool;
+  int my_bool;
 
   bitarray += index / 8; /* skip to char */
-  bool = (*bitarray & (1 << (index % 8)));
-
-  return bool;
-}
-
-static void set_bool(char *bitarray, unsigned int index, int bool)
+  my_bool = (*bitarray & (1 << (index % 8)));
+
+  return my_bool;
+}
+
+static void set_bool(char *bitarray, unsigned int index, int my_bool)
 {
   bitarray += index / 8; /* skip to char */
-  if (bool)
+  if (my_bool)
     *bitarray |= 1 << (index % 8);
   else    

trunk/src/sh_mem.c

@@ -150 +150 @@
     {
       memlist_t   * merr = calloc(1,sizeof(memlist_t));
-
-      memcpy(merr, this, sizeof(memlist_t));
-      merr->next = merrlist;
-      merrlist   = merr;
-
+      if (merr) {
+          memcpy(merr, this, sizeof(memlist_t));
+          merr->next = merrlist;
+          merrlist   = merr;
+        }
       this = this->next;
     }
@@ -198 +198 @@
         {
           merr = calloc (1,sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 2;
-
-          merr->next = merrlist;
-          merrlist   = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 2;
+            merr->next = merrlist;
+            merrlist   = merr;
+          }
         }
       else
@@ -210 +210 @@
             {
               merr = calloc(1, sizeof(memlist_t));
-              
-              memcpy(merr, this, sizeof(memlist_t));
-              merr->size = 1;
-              
-              merr->next = merrlist;
-              merrlist   = merr;
+              if (merr) {
+                memcpy(merr, this, sizeof(memlist_t));
+                merr->size = 1;
+                merr->next = merrlist;
+                merrlist   = merr;
+              }
             }
           if ( this->real_address[SH_MEMMULT-1] != CHECKBYTE )
             {
               merr = calloc(1, sizeof(memlist_t));
-              
-              memcpy(merr, this, sizeof(memlist_t));
-              merr->size = 0;
-              
-              merr->next = merrlist;
-              merrlist   = merr;
+              if (merr) {
+                memcpy(merr, this, sizeof(memlist_t));
+                merr->size = 0;
+                merr->next = merrlist;
+                merrlist   = merr;
+              }
             }
         }
@@ -378 +378 @@
         {
           merr = calloc(1, sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 1;
-
-          merr->next = merrlist;
-          merrlist = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 1;
+            merr->next = merrlist;
+            merrlist = merr;
+          }
         }
 
@@ -389 +389 @@
         {
           merr = calloc(1,sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 0;
-
-          merr->next = merrlist;
-          merrlist = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 0;
+            merr->next = merrlist;
+            merrlist = merr;
+          }
         }
 

trunk/src/sh_port2proc.c

@@ -91 +91 @@
   sl_snprintf (path, sizeof(path), "/proc/%ld/exe", (unsigned long) add->pid);
 
+  /* cppcheck-suppress syntaxError */
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
     {

trunk/src/sh_portcheck.c

@@ -492 +492 @@
   struct sh_portentry * new = SH_ALLOC (sizeof(struct sh_portentry));
 
+  if (!new) return;
   new->port = port;
   sh_ipvx_ntoa(new->interface, SH_INTERFACE_SIZE, paddr);
@@ -1960 +1961 @@
 {
   struct added_dev * new = SH_ALLOC(sizeof(struct added_dev));
+  if (!new) return;
   sl_strlcpy(new->dev, buf, 64);
   new->next = dev_list;
@@ -2122 +2124 @@
 
   black = SH_ALLOC (sizeof(struct sh_port));
+  if (!black) return -1;
   black->paddr = SH_ALLOC (sizeof(struct sh_sockaddr));
   black->port  = port;
@@ -2189 +2192 @@
 
   transient = SH_ALLOC (sizeof(struct sh_port));
+  if (!transient) return -1;
   transient->paddr = SH_ALLOC (sizeof(struct sh_sockaddr));
   transient->port  = port;
@@ -2324 +2328 @@
   if (strchr(str, ':'))
     {
-      char *last = strrchr(str, ':');
+      const char *last = strrchr(str, ':');
       if (last != NULL)
         {
           size_t tolast = (last - str);
           interface = SH_ALLOC(tolast+1);
+          if (!interface) return -1;
           sl_strlcpy(interface, str, tolast+1);
           interface[tolast] = '\0';
@@ -2341 +2346 @@
     {
       interface = SH_ALLOC(8);
+      if (!interface) return -1;
       sl_strlcpy(interface, _("0.0.0.0"), 8);
       interface[7] = '\0';

trunk/src/sh_processcheck.c

@@ -210 +210 @@
   sl_snprintf (path, sizeof(path), _("/proc/%ld/exe"), (unsigned long) pid);
 
+  /* cppcheck-suppress syntaxError */
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
     {
@@ -217 +218 @@
   sl_snprintf (path, sizeof(path), _("/proc/%ld/file"), (unsigned long) pid);
 
+  /* cppcheck-suppress syntaxError */
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
     {
@@ -224 +226 @@
   sl_snprintf (path, sizeof(path), _("/proc/%ld/path/a.out"), (unsigned long) pid);
 
+  /* cppcheck-suppress syntaxError */
   if (0 == retry_lstat(FIL__, __LINE__, path, &sbuf) && S_ISLNK(sbuf.st_mode))
     {

trunk/src/sh_sig.c

@@ -645 +645 @@
   int    flag_sig  = S_FALSE;
   SL_TICKET fdTmp  = (-1);
-  SL_TICKET open_tmp (void);
+  SL_TICKET open_tmp  (void);
+  int       close_tmp ( SL_TICKET);
 
   /* extract the data and copy to temporary file
@@ -660 +661 @@
 
   fin_cp = fdopen(dup(get_the_fd(fd)), "rb");
+  if (!fin_cp) { close_tmp(fdTmp); return -1; }
   buf = SH_ALLOC(fgets_buf_size);
-
+  
   while (NULL != fgets(buf, fgets_buf_size, fin_cp))
     {
@@ -720 +722 @@
   fin_cp = fdopen(dup(get_the_fd(fdTmp)), "rb");
   FILE * fout = fopen("xxx.out", "w+");
+  if (!fout) { close_tmp(fdTmp); return -1; }
+  if (!fin_cp) { close_tmp(fdTmp); fclose(fout); return -1; }
   while (NULL != fgets(buf, fgets_buf_size, fin_cp))
     {
@@ -1598 +1602 @@
   int    flag_nohead = S_FALSE;
   SL_TICKET fdTmp = (-1);
-  SL_TICKET open_tmp (void);
-
+  SL_TICKET open_tmp  (void);
+  int       close_tmp ( SL_TICKET);
+  
   /* extract the data and copy to temporary file
    */
@@ -1613 +1618 @@
 
   fin_cp = fdopen(dup(get_the_fd(fd)), "rb");
+  if (!fin_cp) { close_tmp(fdTmp); return -1; }
   buf = SH_ALLOC(fgets_buf_size);
-
+  
   while (NULL != fgets(buf, fgets_buf_size, fin_cp))
     {

trunk/src/sh_socket.c

@@ -89 +89 @@
 int sh_socket_store_uuid(const char * cmd)
 {
-  char * p = sh_util_strdup(cmd);
-  char * q = strchr(cmd, ':');
+  const char * q = strchr(cmd, ':');
   char   entry[SH_BUFSIZE];
   SH_DELTA_DB db;
 
-  if (!q) { SH_FREE(p); return -1; }
+  if (!q) { return -1; }
 
   ++q;
 
-  if (0 != sh_uuid_check(q)) { SH_FREE(p); return -1; }
+  if (0 != sh_uuid_check(q)) { return -1; }
 
   db.count = 0;
   db.last_time = (time_t) 0;
   sl_strlcpy(db.uuid, q, SH_UUID_BUF);
-  SH_FREE(p);
 
   if (NULL != unparse_entry(&db, entry, sizeof(entry)))
@@ -495 +493 @@
     {
 #ifdef S_ISSOCK
-      if (S_ISSOCK (sbuf.st_mode))
+      /* cppcheck-suppress syntaxError */
+      if (S_ISSOCK(sbuf.st_mode))
         {
           retval = retry_aud_unlink (FIL__, __LINE__, sh_sockname);

trunk/src/sh_static.c

@@ -1170 +1170 @@
 
         while (dotted && *dotted) {
-                char *c = strchr(dotted, '.');
+                const char *c = strchr(dotted, '.');
                 unsigned int l = c ? (unsigned int)(c - dotted) : strlen(dotted);
 

trunk/src/sh_string.c

@@ -697 +697 @@
 
 void Test_string (CuTest *tc) {
-  int status, i, max = 120;
+  int status = -1, i, max = 120;
   FILE * fp;
   sh_string * s = NULL;
@@ -721 +721 @@
 
   fp = fdopen(status, "r+");
-  CuAssertPtrNotNull(tc, fp);
-
-  for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 0 */
-  for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 1 */
-  for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 2 */
-  for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 3 */
-  for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 4 */
-  for (i = 0; i < 238; ++i) { fputc ('a', fp); } fputc ('\n', fp);
-  for (i = 0; i < 239; ++i) { fputc ('a', fp); } fputc ('\n', fp);
-  for (i = 0; i < 240; ++i) { fputc ('a', fp); } fputc ('\n', fp);
-  for (i = 0; i < 241; ++i) { fputc ('a', fp); } fputc ('\n', fp);
-
-  rewind(fp);
-
+  CuAssertPtrNotNull(tc, fp); /* cppcheck doesn't understand this */
+
+  if (fp) {
+    for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 0 */
+    for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 1 */
+    for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 2 */
+    for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 3 */
+    for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 4 */
+    for (i = 0; i < 238; ++i) { fputc ('a', fp); } fputc ('\n', fp);
+    for (i = 0; i < 239; ++i) { fputc ('a', fp); } fputc ('\n', fp);
+    for (i = 0; i < 240; ++i) { fputc ('a', fp); } fputc ('\n', fp);
+    for (i = 0; i < 241; ++i) { fputc ('a', fp); } fputc ('\n', fp);
+
+    rewind(fp);
+  }
   for (i = 0; i < 9; ++i)
     {
-      status = sh_string_read(s, fp, max);
+      if (fp)
+        status = sh_string_read(s, fp, max);
 
       switch (i) {
@@ -784 +786 @@
     }
 
-  rewind(fp);
+  if (fp) rewind(fp);
 
   sh_string_truncate(s, 0);
@@ -791 +793 @@
   for (i = 0; i < 9; ++i)
     {
-      status = sh_string_read(s, fp, 240);
+      if (fp)
+        status = sh_string_read(s, fp, 240);
       if (status == -2)
-        sh_string_read(s, fp, 240);
+        { if (fp) sh_string_read(s, fp, 240); }
       else
         {
@@ -806 +809 @@
     }
 
-  status = fclose(fp); 
+  if (fp)
+    status = fclose(fp); 
   CuAssertTrue(tc, status == 0);
   status = remove(template);

trunk/src/sh_suidchk.c

@@ -256 +256 @@
           return -1; 
         }
+      /* cppcheck-suppress syntaxError */
       if (/*@-usedef@*/!S_ISDIR(one.st_mode)/*@+usedef@*/)
         
@@ -350 +351 @@
           return -1;
         }
+      /* cppcheck-suppress syntaxError */
       if (!S_ISREG(two.st_mode))
         { 

trunk/src/sh_xfer_client.c

@@ -1549 +1549 @@
 #if !defined(SH_ENCRYPT)
                   if (4 == sl_strlen(errmsg)) {  /* backward compatibility   */
-                    buffersize = sl_strlen(buffer);
-                    buffer[buffersize]   = theProto; /* nctl//DATA//theProto */
-                    buffer[buffersize+1] = '\0';
+                    size_t bufferlen = sl_strlen(buffer);
+                    buffer[bufferlen]   = (char) theProto; /* nctl//DATA//theProto */
+                    buffer[bufferlen+1] = '\0';
                   }
                   sh_tools_hash_add(foo_M1, buffer, buffersize+1);

trunk/src/slib.c

@@ -1178 +1178 @@
   size_t          needle_len;
   size_t          haystack_len;
+#else
+  char *          result;
 #endif
   
   if (haystack == NULL || needle == NULL)
     return NULL;
-  if (*needle == '\0' || *haystack == '\0')
+  if (*needle == '\0')
+    return (char *)(uintptr_t)haystack;
+  if (*haystack == '\0')
     return NULL;
 
 #if defined(HAVE_STRSTR)
-  return (strstr(haystack, needle));
+  result = (char *)(uintptr_t)strstr(haystack, needle);
+  return result;
 #else
   needle_len   = strlen(needle);
   haystack_len = strlen(haystack);
 
+  if (needle_len > haystack_len)
+    return NULL;
+
   for (i = 0; i <= (haystack_len-needle_len); ++i)
     if (0 == sl_strncmp(&haystack[i], needle, needle_len))
-      return (needle);
+      return (&haystack[i]);
   return NULL;
 #endif
@@ -2107 +2115 @@
 
   len = sl_strlen(filename)+1;
-
+  
   if ( (ofiles[fd]->path = calloc(1,len) ) == NULL)
     {
@@ -2129 +2137 @@
     }
 
-  sl_strlcpy (ofiles[fd]->path, filename, len);
+  /* allocated length of path is strlen(filename)+1 */
+  memcpy(ofiles[fd]->path, filename, len);
+  
   ofiles[fd]->ticket  = ticket;
   ofiles[fd]->fd      = fd;

trunk/src/trustfile.c

@@ -437 +437 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = calloc(1,SH_GRBUF_SIZE);
+  if (!buffer)
+     goto end_false;
   status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
 #else
@@ -456 +458 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   pbuffer = calloc(1,SH_PWBUF_SIZE);
+  if (!pbuffer)
+     goto end_false;
 #endif
 
@@ -550 +554 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
   buffer = calloc(1,SH_GRBUF_SIZE);
+  if (!buffer) {
+    retval = S_FALSE;
+    goto end_retval;
+  }
   status = sh_getgrgid_r(grp, &gr, buffer, SH_GRBUF_SIZE, &g);
 #else
@@ -581 +589 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
   pbuffer = calloc(1,SH_PWBUF_SIZE);
+  if (!pbuffer) {
+    retval = S_FALSE;
+    goto end_retval;
+  }
 #endif
 

trunk/src/yulectl.c

@@ -311 +311 @@
           if (i == 0)
             {
-              char * p = strchr(str, ':'); ++p;
+              const char * p = strchr(str, ':'); ++p;
               if ( 0 == check_uuid(p) )
                 return 0;

trunk/test/testrun_1.sh

@@ -1100 +1100 @@
         fi
         #
-        # wtmp may not be readable
-        #
-        tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | wc -l`
+        # wtmp may not be readable -- and utmp may not exist anymore
+        #
+        tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | grep -v utmp | wc -l`
         if [ $tmp -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "errors during check";

trunk/test/testrun_1a.sh

@@ -55 +55 @@
         return 1
     fi
-    "$CONVERT" --help | grep  ImageMagick >/dev/null 2>&1
+    "$CONVERT" -version | grep  ImageMagick >/dev/null 2>&1
     if [ $? -ne 0 ]; then
         [ -z "$verbose" ] || log_msg_fail "Convert utility is not ImageMagick convert";

trunk/test/testrun_1b.sh

@@ -363 +363 @@
             #
             PRECONV=`find_path convert`
-            "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
+            "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
                 CONVERT="${PRECONV}"
 

trunk/test/testrun_1i.sh

@@ -299 +299 @@
             #
             PRECONV=`find_path convert`
-            "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
+            "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
                 CONVERT="${PRECONV}"