message: handle Writer.Close errors in Entity.WriteTo

emersion · emersion · commit f7e55c42f6e9 · 2024-03-06T15:33:58.000+01:00
diff --git a/entity.go b/entity.go
@@ -187,9 +187,13 @@ func (e *Entity) WriteTo(w io.Writer) error {
 	if err != nil {
 		return err
 	}
-	defer ew.Close()
 
-	return e.writeBodyTo(ew)
+	if err := e.writeBodyTo(ew); err != nil {
+		ew.Close()
+		return err
+	}
+
+	return ew.Close()
 }
 
 // WalkFunc is the type of the function called for each part visited by Walk.

Original file line number	Diff line number	Diff line change
`@@ -187,9 +187,13 @@ func (e *Entity) WriteTo(w io.Writer) error {`
`187`	`187`	`if err != nil {`
`188`	`188`	`return err`
`189`	`189`	`}`
`190`		`- defer ew.Close()`
`191`	`190`
`192`		`- return e.writeBodyTo(ew)`
	`191`	`+ if err := e.writeBodyTo(ew); err != nil {`
	`192`	`+ ew.Close()`
	`193`	`+ return err`
	`194`	`+ }`
	`195`	`+`
	`196`	`+ return ew.Close()`
`193`	`197`	`}`
`194`	`198`
`195`	`199`	`// WalkFunc is the type of the function called for each part visited by Walk.`