closing encoder before returning error

szamuboy · szamuboy · commit 8d1dd5ca4796 · 2018-12-10T11:06:21.000+01:00
Signed-off-by: Gergely Szabo &lt;gergely.szabo@origoss.com&gt;
diff --git a/fluent/fluent.go b/fluent/fluent.go
@@ -251,11 +251,15 @@ func getUniqueID(timeUnix int64) (string, error) {
 	buf := bytes.NewBuffer(nil)
 	enc := base64.NewEncoder(base64.StdEncoding, buf)
 	if err := binary.Write(enc, binary.LittleEndian, timeUnix); err != nil {
+		enc.Close()
 		return "", err
 	}
 	if err := binary.Write(enc, binary.LittleEndian, rand.Uint64()); err != nil {
+		enc.Close()
 		return "", err
 	}
+	// encoder needs to be closed before buf.String(), defer does not work
+	// here
 	enc.Close()
 	return buf.String(), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -251,11 +251,15 @@ func getUniqueID(timeUnix int64) (string, error) {`
`251`	`251`	`buf := bytes.NewBuffer(nil)`
`252`	`252`	`enc := base64.NewEncoder(base64.StdEncoding, buf)`
`253`	`253`	`if err := binary.Write(enc, binary.LittleEndian, timeUnix); err != nil {`
	`254`	`+ enc.Close()`
`254`	`255`	`return "", err`
`255`	`256`	`}`
`256`	`257`	`if err := binary.Write(enc, binary.LittleEndian, rand.Uint64()); err != nil {`
	`258`	`+ enc.Close()`
`257`	`259`	`return "", err`
`258`	`260`	`}`
	`261`	`+ // encoder needs to be closed before buf.String(), defer does not work`
	`262`	`+ // here`
`259`	`263`	`enc.Close()`
`260`	`264`	`return buf.String(), nil`
`261`	`265`	`}`