Changeset 47d4f8c for lib

Timestamp:

06/27/18 18:01:48 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

1ed69dc

Parents:

35de364

Message:

Fix various string truncation/overflow warnings

Thanks gcc 8!

Location:

lib

Files:

• format_linux_common.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)
• trace.c (modified) (3 diffs)

lib/format_linux_common.c

@@ -87 +87 @@
                 sock = socket(PF_INET, SOCK_STREAM, 0);
                 memset(&ifr, 0, sizeof(struct ifreq));
-                strncpy(ifr.ifr_name, libtrace->uridata, IF_NAMESIZE);
+                strncpy(ifr.ifr_name, libtrace->uridata, IF_NAMESIZE - 1);
                 if (ioctl(sock, SIOCGIFHWADDR, &ifr) != 0) {
                         perror("Can't get HWADDR for interface");

lib/libtrace.h.in

@@ -277 +277 @@
 typedef struct trace_err_t{
         int err_num;            /**< error code */
-        char problem[255];      /**< the format, uri etc that caused the error for reporting purposes */
+        char problem[1024];     /**< the format, uri etc that caused the error for reporting purposes */
 } libtrace_err_t;
 

lib/trace.c

@@ -107 +107 @@
  * will use our own one that does
  */
-static void xstrncpy(char *dest, const char *src, size_t n)
-{
-        strncpy(dest,src,n);
-        dest[n]='\0';
+static inline void xstrncpy(char *dest, const char *src, size_t n,
+                size_t destlen)
+{
+        size_t slen = destlen - 1;
+        if (n < slen) {
+                slen = n;
+        }
+        strncpy(dest,src,slen);
+        dest[slen]='\0';
 }
 
@@ -120 +125 @@
                 exit(EXIT_FAILURE);
         }
-        xstrncpy(ret,src,n);
+        xstrncpy(ret,src,n,n+1);
         return ret;
 }
@@ -371 +376 @@
 
         if((uridata = strchr(uri,':')) == NULL) {
-                xstrncpy(scan, uri, strlen(uri));
+                xstrncpy(scan, uri, strlen(uri), URI_PROTO_LINE);
         } else {
-                xstrncpy(scan,uri, (size_t)(uridata - uri));
+                xstrncpy(scan,uri, (size_t)(uridata - uri), URI_PROTO_LINE);
         }