Merge pull request #692 from SailorStu/fix-Receive-panic

Fixed Receive Panic if h.MessageSize < hdrlen bytes.
gopcua · Oct 17, 2023 · 41e54cf · 41e54cf
2 parents fd06ca1 + d06cdc3
commit 41e54cf
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/uacp/conn.go b/uacp/conn.go
@@ -367,7 +367,10 @@ func (c *Conn) Receive() ([]byte, error) {
 	}
 
 	if h.MessageSize > c.ack.ReceiveBufSize {
-		return nil, errors.Errorf("uacp: message too large: %d > %d bytes", h.MessageSize, c.ack.ReceiveBufSize)
+		return nil, errors.Errorf("uacp: message too large: %d > %d bytes. MsgType=%s, ChunkType=%c", h.MessageSize, c.ack.ReceiveBufSize, h.MessageType, h.ChunkType)
+	}
+	if h.MessageSize < hdrlen {
+		return nil, errors.Errorf("uacp: message too small: %d bytes. MsgType=%s, ChunkType=%c.", h.MessageSize, h.MessageType, h.ChunkType)
 	}
 
 	if _, err := io.ReadFull(c, b[hdrlen:h.MessageSize]); err != nil {