Merge pull request #447 from wneessen/bug/446_emltomsgfromstring-failed-with-attachments

Fix assignment to nil map in EML parser

Author: wneessen

REUSE.toml

@@ -4,6 +4,11 @@
 
 version = 1
 SPDX-PackageName = "go-mail"
-SPDX-PackageSupplier = "Winni Neessen <winni@neessen.dev>"
+SPDX-PackageSupplier = "The go-mail Authors"
 SPDX-PackageDownloadLocation = "https://github.com/wneessen/go-mail"
-annotations = []
+
+[[annotations]]
+path = ["testdata/**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "The go-mail Authors"
+SPDX-License-Identifier = "MIT"

eml.go

@@ -48,13 +48,7 @@ func EMLToMsgFromString(emlString string) (*Msg, error) {
 //   - A pointer to the Msg object populated with the parsed data, and an error if parsing
 //     fails.
 func EMLToMsgFromReader(reader io.Reader) (*Msg, error) {
-	msg := &Msg{
-		addrHeader:    make(map[AddrHeader][]*netmail.Address),
-		genHeader:     make(map[Header][]string),
-		preformHeader: make(map[Header]string),
-		mimever:       MIME10,
-	}
-
+	msg := NewMsg()
 	parsedMsg, bodybuf, err := readEMLFromReader(reader)
 	if err != nil || parsedMsg == nil {
 		return msg, fmt.Errorf("failed to parse EML from reader: %w", err)
@@ -81,13 +75,7 @@ func EMLToMsgFromReader(reader io.Reader) (*Msg, error) {
 //   - A pointer to the Msg object populated with the parsed data, and an error if parsing
 //     fails.
 func EMLToMsgFromFile(filePath string) (*Msg, error) {
-	msg := &Msg{
-		addrHeader:    make(map[AddrHeader][]*netmail.Address),
-		genHeader:     make(map[Header][]string),
-		preformHeader: make(map[Header]string),
-		mimever:       MIME10,
-	}
-
+	msg := NewMsg()
 	parsedMsg, bodybuf, err := readEML(filePath)
 	if err != nil || parsedMsg == nil {
 		return msg, fmt.Errorf("failed to parse EML file: %w", err)