Use strdup() to mallocate a copy of a string.

Don't incorrectly reimplement strdup(), just use it.

1 files changed, 2 insertions, 14 deletions

diff --git a/pcap-new.c b/pcap-new.c
index 804cb7de..04a84442 100644
--- a/pcap-new.c
+++ b/pcap-new.c
@@ -287,9 +287,7 @@ int pcap_findalldevs_ex(const char *source, struct pcap_rmtauth *auth, pcap_if_t
 					return -1;
 				}
 
-				stringlen = strlen(tmpstring);
-
-				dev->name = (char *)malloc(stringlen + 1);
+				dev->name = strdup(tmpstring);
 				if (dev->name == NULL)
 				{
 					pcap_fmt_errmsg_for_errno(errbuf,
@@ -299,18 +297,11 @@ int pcap_findalldevs_ex(const char *source, struct pcap_rmtauth *auth, pcap_if_t
 					return -1;
 				}
 
-				pcap_strlcpy(dev->name, tmpstring, stringlen);
-
-				dev->name[stringlen] = 0;
-
 				/* Create the description */
 				pcap_snprintf(tmpstring, sizeof(tmpstring) - 1, "%s '%s' %s", PCAP_TEXT_SOURCE_FILE,
 					filename, PCAP_TEXT_SOURCE_ON_LOCAL_HOST);
 
-				stringlen = strlen(tmpstring);
-
-				dev->description = (char *)malloc(stringlen + 1);
-
+				dev->description = strdup(tmpstring);
 				if (dev->description == NULL)
 				{
 					pcap_fmt_errmsg_for_errno(errbuf,
@@ -320,9 +311,6 @@ int pcap_findalldevs_ex(const char *source, struct pcap_rmtauth *auth, pcap_if_t
 					return -1;
 				}
 
-				/* Copy the new device description into the correct memory location */
-				pcap_strlcpy(dev->description, tmpstring, stringlen + 1);
-
 				pcap_close(fp);
 			}
 		}