tun: account for null termination on Linux

diff --git a/tun_linux.go b/tun_linux.go
index a74a9ccb00c71057d1fe130e8dd6615ad0d012fc..446cc1799ec135e4e4c2768d6d57e5f1ae431dd2 100644 (file)
--- a/tun_linux.go
+++ b/tun_linux.go
@@ -19,6 +19,7 @@ import (
        "net"
        "os"
        "strconv"
+       "bytes"
        "strings"
        "syscall"
        "time"
@@ -268,7 +269,12 @@ func (tun *NativeTun) Name() (string, error) {
        if errno != 0 {
                return "", errors.New("Failed to get name of TUN device: " + strconv.FormatInt(int64(errno), 10))
        }
-       tun.name = string(ifr[:])
+       nullStr := ifr[:]
+       i := bytes.IndexByte(nullStr, 0)
+       if i != -1 {
+               nullStr = nullStr[:i]
+       }
+       tun.name = string(nullStr)
        return tun.name, nil
 }