Merge branch 'master' into 1.1

[meshlink] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index b02e88e721ff3d06bf51f2bec0d136d5243cdbfd..e692ca9ff8c5082b8195c24b7de2fe3b8bf7bf84 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -62,7 +62,8 @@ bool setup_device(void) {
 
        if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 #ifdef HAVE_LINUX_IF_TUN_H
-               iface = xstrdup(netname);
+               if (netname != NULL)
+                       iface = xstrdup(netname);
 #else
                iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
 #endif