lib/protocol: Avoid panic in DeviceIDFromBytes (#6714)

2020-06-07 10:31:12 +02:00
parent 607bcc0b0e
commit 46536509d7
9 changed files with 69 additions and 21 deletions
@@ -56,7 +56,11 @@ type SessionInvitation struct {
 }

 func (i SessionInvitation) String() string {
-	return fmt.Sprintf("%s@%s", syncthingprotocol.DeviceIDFromBytes(i.From), i.AddressString())
+	device := "<invalid>"
+	if address, err := syncthingprotocol.DeviceIDFromBytes(i.From); err == nil {
+		device = address.String()
+	}
+	return fmt.Sprintf("%s@%s", device, i.AddressString())
 }

 func (i SessionInvitation) GoString() string {