From 35bacb7fe3e00ce43518ff0a28bb8340e37be373 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Thu, 25 Jul 2013 15:38:29 -0700
Subject: [PATCH] netdev-bsd: Use xmemdup0() to simplify
netdev_bsd_get_next_hop().
Signed-off-by: Ben Pfaff <blp@nicira.com>
CC: Ed Maste <emaste@freebsd.org>
CC: YAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp>
---
lib/netdev-bsd.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
index 2e49c9447..6ff6b3e95 100644
--- a/lib/netdev-bsd.c
+++ b/lib/netdev-bsd.c
@@ -1312,12 +1312,9 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED,
if ((i == RTA_IFP) && sa->sa_family == AF_LINK) {
const struct sockaddr_dl * const sdl =
(const struct sockaddr_dl *)sa;
- const size_t nlen = sdl->sdl_nlen;
- char * const kernel_name = xmalloc(nlen + 1);
- const char *name;
+ char *kernel_name;
- memcpy(kernel_name, sdl->sdl_data, nlen);
- kernel_name[nlen] = 0;
+ kernel_name = xmemdup0(sdl->sdl_data, sdl->sdl_nlen);
name = netdev_bsd_convert_kernel_name_to_ovs_name(kernel_name);
if (name == NULL) {
ifname = xstrdup(kernel_name);
--
2.47.0