From 37efdcaccfb16e47137728b5462c90d0b2ae8460 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Tue, 26 Jan 2021 10:35:25 -0800 Subject: [PATCH] device: fix shadowing of err in IpcHandle The declaration of err in nextByte, err := buffered.ReadByte shadows the declaration of err in op, err := buffered.ReadString('\n') above. As a result, the assignments to err in err = ipcErrorf(ipc.IpcErrorInvalid, "trailing character in UAPI get: %c", nextByte) and in err = device.IpcGetOperation(buffered.Writer) do not modify the correct err variable. Found by staticcheck. Signed-off-by: Josh Bleecher Snyder --- device/uapi.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device/uapi.go b/device/uapi.go index 2110a67..277c02f 100644 --- a/device/uapi.go +++ b/device/uapi.go @@ -403,7 +403,8 @@ func (device *Device) IpcHandle(socket net.Conn) { case "set=1\n": err = device.IpcSetOperation(buffered.Reader) case "get=1\n": - nextByte, err := buffered.ReadByte() + var nextByte byte + nextByte, err = buffered.ReadByte() if err != nil { return }