Launcher, app/base, sentry, update service

pkg/message/parser.go

@@ -38,6 +38,15 @@ import (
 
 // Parse parses RAW message.
 func Parse(r io.Reader) (m *pmapi.Message, mimeBody, plainBody string, attReaders []io.Reader, err error) {
+	defer func() {
+		r := recover()
+		if r == nil {
+			return
+		}
+
+		err = fmt.Errorf("panic while parsing message: %v", r)
+	}()
+
 	p, err := parser.New(r)
 	if err != nil {
 		return nil, "", "", nil, errors.Wrap(err, "failed to create new parser")

pkg/message/parser_test.go

@@ -545,6 +545,20 @@ func TestParseEncodedContentTypeBad(t *testing.T) {
 	require.Error(t, err)
 }
 
+type panicReader struct{}
+
+func (panicReader) Read(p []byte) (int, error) {
+	panic("lol")
+}
+
+func TestParsePanic(t *testing.T) {
+	var err error
+	require.NotPanics(t, func() {
+		_, _, _, _, err = Parse(&panicReader{})
+	})
+	require.Error(t, err)
+}
+
 func getFileReader(filename string) io.Reader {
 	f, err := os.Open(filepath.Join("testdata", filename))
 	if err != nil {