package/wireguard-go
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-go synced 2025-10-24 08:53:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

device: add nil check before convert typed error back

Browse Source 
Since errors.As(err, target) returns false when err is nil,
which cause status set to 1 when no error occurs for Ipc{Get,Set}Operation.

Signed-off-by: Wenxuan Zhao <viz@linux.com>
This commit is contained in:
Wenxuan Zhao
2020-04-18 07:27:39 -07:00
committed by David Crawshaw
parent a4657f996d
commit 75a41b24ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
device/uapi.go
View File

@@ -423,7 +423,7 @@ func (device *Device) IpcHandle(socket net.Conn) {
switch op { switch op {
case "set=1\n": case "set=1\n":
err = device.IpcSetOperation(buffered.Reader) err = device.IpcSetOperation(buffered.Reader)
if !errors.As(err, &status) { if err != nil && !errors.As(err, &status) {
// should never happen // should never happen
device.log.Error.Println("Invalid UAPI error:", err) device.log.Error.Println("Invalid UAPI error:", err)
status = &IPCError{1} status = &IPCError{1}
@@ -431,7 +431,7 @@ func (device *Device) IpcHandle(socket net.Conn) {
case "get=1\n": case "get=1\n":
err = device.IpcGetOperation(buffered.Writer) err = device.IpcGetOperation(buffered.Writer)
if !errors.As(err, &status) { if err != nil && !errors.As(err, &status) {
// should never happen // should never happen
device.log.Error.Println("Invalid UAPI error:", err) device.log.Error.Println("Invalid UAPI error:", err)
status = &IPCError{1} status = &IPCError{1}