Changeset c62129c5 in rtems

Timestamp:

Sep 2, 2015, 9:54:25 PM (5 years ago)

Author:

Martin Galvan <martin.galvan@…>

Branches:

4.11

Children:

631d254

Parents:

1491f694

git-author:

Martin Galvan <martin.galvan@…> (09/02/15 21:54:25)

git-committer:

Joel Sherrill <joel.sherrill@…> (09/03/15 16:27:48)

Message:

cpukit/libnetworking/rtems/rtems_dhcp.c: Fix leak on realloc failure for dhcp_hostname.

Closes #2405.

File:

• cpukit/libnetworking/rtems/rtems_dhcp.c (modified) (1 diff)

cpukit/libnetworking/rtems/rtems_dhcp.c

@@ -395 +395 @@
           len = MAXHOSTNAMELEN-1;
         }
-        if (sethostname (p, len) < 0)
+        if (sethostname (p, len) < 0) {
           printf ("dhcpc: can't set host name");
+        }
         if (dhcp_hostname != NULL)
         {
-          dhcp_hostname = realloc (dhcp_hostname, len);
-          strncpy (dhcp_hostname, p, len);
-        }
-        else
+          char *tmp = realloc (dhcp_hostname, len);
+          if (tmp != NULL) {
+            dhcp_hostname = tmp;
+            strncpy (dhcp_hostname, p, len);
+          } else {  /* realloc failed */
+            printf ("dhcpc: realloc failed (%s:%d)", __FILE__, __LINE__);
+            free (dhcp_hostname);
+            dhcp_hostname = NULL;
+          }
+        } else { /* dhcp_hostname == NULL */
           dhcp_hostname = strndup (p, len);
+        }
         break;