]> Sergey Matveev's repositories - sgblog.git/commitdiff
Do not omit errors
authorSergey Matveev <stargrave@stargrave.org>
Thu, 23 Mar 2023 10:59:04 +0000 (13:59 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Thu, 23 Mar 2023 11:01:01 +0000 (14:01 +0300)
cmd/sgblog-comment-add/mail.go

index 2a8bf45b3e03c16803a5e973645a289835ef80e8..98ee1626b785a48012724230ccd1be0d10b672a6 100644 (file)
@@ -21,6 +21,7 @@ import (
        "bytes"
        "encoding/base64"
        "errors"
+       "fmt"
        "io"
        "mime"
        "mime/multipart"
@@ -74,6 +75,10 @@ func parseEmail(msg *mail.Message) (subj string, body io.Reader, err error) {
                return
        }
        ct, params, err := mime.ParseMediaType(ct)
+       if err != nil {
+               err = fmt.Errorf("can not ParseMediaType: %w", err)
+               return
+       }
        if ct != "multipart/signed" {
                err = errors.New("only text/plain and multipart/signed+text/plain Content-Type supported")
                return
@@ -108,7 +113,11 @@ func parseEmail(msg *mail.Message) (subj string, body io.Reader, err error) {
                        return
                }
                if strings.HasPrefix(ct, "multipart/mixed") {
-                       ct, params, err = mime.ParseMediaType(ct)
+                       _, params, err = mime.ParseMediaType(ct)
+                       if err != nil {
+                               err = fmt.Errorf("can not ParseMediaType: %w", err)
+                               return
+                       }
                        boundary = params["boundary"]
                        if len(boundary) == 0 {
                                err = errors.New("no boundary string")