Changeset 560 for trunk/src

Timestamp:

Oct 31, 2020, 11:44:21 PM (4 years ago)

Author:

katerina

Message:

Fix for ticket #449 (gcc 10 compile issues).

Location:

trunk/src

Files:

• sh_audit.c (modified) (1 diff)
• sh_dbIO.c (modified) (1 diff)
• sh_filter.c (modified) (1 diff)
• sh_ipvx.c (modified) (1 diff)
• sh_portcheck.c (modified) (2 diffs)
• sh_srp.c (modified) (1 diff)
• sh_tiger1_64.c (modified) (1 diff)
• sh_utils.c (modified) (3 diffs)

trunk/src/sh_audit.c

@@ -75 +75 @@
 
   if (auparse_find_field(au, _("success")))
-    strncpy(state->success, auparse_interpret_field(au), REC_SIZE_SUCCESS);
+    sl_strlcpy(state->success, auparse_interpret_field(au), REC_SIZE_SUCCESS);
 
   if (auparse_find_field(au, "uid"))

trunk/src/sh_dbIO.c

@@ -227 +227 @@
     {
       /* alignment problem */
-      unsigned char swap;
-      static unsigned short ooop;
-      unsigned char * ii;
-      ooop = *iptr;
-      ii = (unsigned char *) &ooop;
-      swap = ii[0]; ii[0] = ii[1]; ii[1] = swap;
+      static unsigned short ooop = *iptr;
+      unsigned short hi   = (ooop & 0xff00);
+      unsigned short lo   = (ooop & 0xff);
+      ooop = (lo << 8) | (hi >> 8);
       return &ooop;
     }

trunk/src/sh_filter.c

@@ -115 +115 @@
   }
 
+  /* cppcheck-suppress uninitvar */
   i = *ntok;
   if (i == SH_FILT_NUM) {

trunk/src/sh_ipvx.c

@@ -201 +201 @@
   static char ipbuf[SH_IP_BUF];
 
+  memset(&ss, 0, sizeof(struct sh_sockaddr));
   sh_ipvx_save(&ss, sa_family, sa);
   sh_ipvx_ntoa (ipbuf, sizeof(ipbuf), &ss);

trunk/src/sh_portcheck.c

@@ -601 +601 @@
   struct sh_portentry * ptr = *head;
   struct sh_portentry * pre = *head;
-  char errbuf[256];
+  char errbuf[512];
 
   /* Take the address to keep gcc from putting them into registers. 
@@ -731 +731 @@
 {
   struct sh_portentry * portent;
-  char errbuf[256];
+  char errbuf[512];
 
   

trunk/src/sh_srp.c

@@ -119 +119 @@
             get_str_internal = ptr;
           else
-            { free(get_str_internal); get_str_internal = NULL; }
+            {
+              /* "If realloc() fails, the original block is left untouched;
+               * it is not freed or moved." */
+              /* cppcheck-suppress doubleFree */
+              free(get_str_internal);
+              get_str_internal = NULL;
+            }
         }
       if (get_str_internal == NULL)

trunk/src/sh_tiger1_64.c

@@ -140 +140 @@
 #define roundend(a,b,c,x) \
  : "+r" (a), "+r" (b), "+r" (c) \
- : "r" (a), "r" (b), "r" (c), "m" (x), "r" (&tiger_table),\
+ : "g" (a), "g" (b), "g" (c), "m" (x), "r" (&tiger_table),\
   "i" (MASK0), "i" (MASK8), "i" (MASK16), "r" (MASK32), "r" (MASK40), "r" (MASK48) \
  : "3", "%rax","%rbx","%rcx","%rdx","%rsi", "%edi", "%r8"  );

trunk/src/sh_utils.c

@@ -827 +827 @@
     copy_four ( (unsigned char *) &(cc[i]), h1[i]);
 
+  /* cppcheck-suppress uninitvar */
   h2 = sh_tiger_hash_uint32 ( inner, TIGER_DATA,
                               (unsigned long) KEY_BLOCK+textlen,
@@ -833 +834 @@
     copy_four ( (unsigned char *) &(cc[i]), h2[i - (KEY_LEN/8)]);
 
+  /* cppcheck-suppress uninitvar */
   SH_FREE(inner);
   
@@ -2201 +2203 @@
     SL_RETURN(NULL, _("sh_util_strconcat"));
 
+  /* cppcheck-suppress uninitvar */
   strnew[0] = '\0';