Fix panic if passing empty data to InboundGroupSession.Unpickle

tulir · tulir · commit 24d2cce9d536 · 2022-09-21T23:50:56.000+03:00
diff --git a/crypto/olm/inboundgroupsession.go b/crypto/olm/inboundgroupsession.go
@@ -132,6 +132,8 @@ func (s *InboundGroupSession) Pickle(key []byte) []byte {
 func (s *InboundGroupSession) Unpickle(pickled, key []byte) error {
 	if len(key) == 0 {
 		return NoKeyProvided
+	} else if len(pickled) == 0 {
+		return EmptyInput
 	}
 	r := C.olm_unpickle_inbound_group_session(
 		(*C.OlmInboundGroupSession)(s.int),

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ func (s *InboundGroupSession) Pickle(key []byte) []byte {`
`132`	`132`	`func (s *InboundGroupSession) Unpickle(pickled, key []byte) error {`
`133`	`133`	`if len(key) == 0 {`
`134`	`134`	`return NoKeyProvided`
	`135`	`+ } else if len(pickled) == 0 {`
	`136`	`+ return EmptyInput`
`135`	`137`	`}`
`136`	`138`	`r := C.olm_unpickle_inbound_group_session(`
`137`	`139`	`(*C.OlmInboundGroupSession)(s.int),`