Fix QoS0 packet parse (#35)

at-wat · Dec 24, 2019 · 21e2736 · 21e2736
1 parent 23846ef
commit 21e2736
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/puback.go b/puback.go
@@ -22,6 +22,9 @@ func (p *pktPubAck) parse(flag byte, contents []byte) (*pktPubAck, error) {
 	if flag != 0 {
 		return nil, ErrInvalidPacket
 	}
+	if len(contents) < 2 {
+		return nil, ErrInvalidPacketLength
+	}
 	_, p.ID = unpackUint16(contents)
 	return p, nil
 }
diff --git a/pubcomp.go b/pubcomp.go
@@ -22,6 +22,9 @@ func (p *pktPubComp) parse(flag byte, contents []byte) (*pktPubComp, error) {
 	if flag != 0 {
 		return nil, ErrInvalidPacket
 	}
+	if len(contents) < 2 {
+		return nil, ErrInvalidPacketLength
+	}
 	_, p.ID = unpackUint16(contents)
 	return p, nil
 }
diff --git a/publish.go b/publish.go
@@ -146,7 +146,12 @@ func (p *pktPublish) parse(flag byte, contents []byte) (*pktPublish, error) {
 	if err != nil {
 		return nil, err
 	}
-	nID, p.Message.ID = unpackUint16(contents[n:])
+	if p.Message.QoS != QoS0 {
+		if len(contents)-n < 2 {
+			return nil, ErrInvalidPacketLength
+		}
+		nID, p.Message.ID = unpackUint16(contents[n:])
+	}
 	p.Message.Payload = contents[n+nID:]
 
 	return p, nil

diff --git a/publish_test.go b/publish_test.go
@@ -27,6 +27,7 @@ func TestPublish_ParseError(t *testing.T) {
 		{0x00, []byte{0x00, 0x01, 0x61, 0x00, 0x00}, nil},
 		{0x00, []byte{0x00, 0x01, 0x00, 0x00, 0x00}, ErrInvalidRune},
 		{0x06, []byte{0x00, 0x01, 0x61, 0x00, 0x00}, ErrInvalidPacket},
+		{0x02, []byte{0x00, 0x01, 0x01}, ErrInvalidPacketLength},
 		{0x00, []byte{0x00, 0x01}, ErrInvalidPacketLength},
 		{0x00, []byte{0x00}, ErrInvalidPacketLength},
 	}

diff --git a/pubrec.go b/pubrec.go
@@ -22,6 +22,9 @@ func (p *pktPubRec) parse(flag byte, contents []byte) (*pktPubRec, error) {
 	if flag != 0 {
 		return nil, ErrInvalidPacket
 	}
+	if len(contents) < 2 {
+		return nil, ErrInvalidPacketLength
+	}
 	_, p.ID = unpackUint16(contents)
 	return p, nil
 }
diff --git a/pubrel.go b/pubrel.go
@@ -22,6 +22,9 @@ func (p *pktPubRel) parse(flag byte, contents []byte) (*pktPubRel, error) {
 	if flag != 0x02 {
 		return nil, ErrInvalidPacket
 	}
+	if len(contents) < 2 {
+		return nil, ErrInvalidPacketLength
+	}
 	_, p.ID = unpackUint16(contents)
 	return p, nil
 }