snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tun: account for null termination on Linux

Browse source
This commit is contained in:
Jason A. Donenfeld 2018-05-05 02:47:35 +02:00
parent e1de0f229a
commit 4a177de09c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tun_linux.go
View file

@ -19,6 +19,7 @@ import (
"net" "net"
"os" "os"
"strconv" "strconv"
"bytes"
"strings" "strings"
"syscall" "syscall"
"time" "time"
@ -268,7 +269,12 @@ func (tun *NativeTun) Name() (string, error) {
if errno != 0 { if errno != 0 {
return "", errors.New("Failed to get name of TUN device: " + strconv.FormatInt(int64(errno), 10)) 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 return tun.name, nil
} }