Changeset 1442:915450ee91c7 in freeDiameter for extensions

Timestamp:

Feb 27, 2020, 2:19:24 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

fix gcc 9.1.1 compile warnings

Use snprintf instead of strncpy to ensure NUL termination.

Simplify attribute copying to calloc/memcpy instead
of malloc/memset/strncpy/assignment.

Appeases gcc 9.1.1 warnings about strncpy bounds.

Location:

extensions

Files:

• app_diameap/diameap_server.c (modified) (1 diff)
• app_radgw/rgw_clients.c (modified) (1 diff)

extensions/app_diameap/diameap_server.c

@@ -1961 +1961 @@
         {
         case 1:
-                attribute_op = malloc(strlen(op));
-                memset(attribute_op, 0, strlen(op));
-                strncpy(attribute_op, op + 1, strlen(op) - 1);
-                attribute_op[strlen(op)] = '\0';
+                attribute_op = calloc(strlen(op), sizeof(char *));
+                memcpy(attribute_op, op + 1, strlen(op) - 1);
                 break;
         case 2:
-                attribute_op = malloc(strlen(op));
-                memset(attribute_op, 0, strlen(op));
-                strncpy(attribute_op, op, strlen(op) - 1);
-                attribute_op[strlen(op)] = '\0';
+                attribute_op = calloc(strlen(op), sizeof(char *));
+                memcpy(attribute_op, op, strlen(op) - 1);
                 break;
         default:
-                attribute_op = malloc(strlen(op) + 1);
-                memset(attribute_op, 0, strlen(op) + 1);
-                strcpy(attribute_op, op);
-                attribute_op[strlen(op) + 1] = '\0';
+                attribute_op = calloc(strlen(op) + 1, sizeof(char *));
+                memcpy(attribute_op, op, strlen(op));
         }
         if (strcmp(attribute_op, "=") == 0)

extensions/app_radgw/rgw_clients.c

@@ -764 +764 @@
                 ret = getaddrinfo(buf, NULL, &hint, &res);
                 if (ret == 0) {
-                        strncpy(buf, res->ai_canonname, sizeof(buf));
+                        snprintf(buf, sizeof(buf), "%s", res->ai_canonname);
                         /* The name was resolved correctly, does it match the IP of the client? */
                         for (ptr = res; ptr != NULL; ptr = ptr->ai_next) {