Merge pull request #445 from dolmen-go/fix-Base64LineBreaker-short-writes

wneessen · web-flow · commit d962f83bb89c · 2025-03-21T10:18:42.000+01:00
Fix "short writes" in Base64LineBreaker.Write
diff --git a/b64linebreaker.go b/b64linebreaker.go
@@ -50,7 +50,7 @@ func (l *base64LineBreaker) Write(data []byte) (numBytes int, err error) {
 		return len(data), nil
 	}
 
-	numBytes, err = l.out.Write(l.line[0:l.used])
+	_, err = l.out.Write(l.line[0:l.used])
 	if err != nil {
 		return
 	}
@@ -62,12 +62,15 @@ func (l *base64LineBreaker) Write(data []byte) (numBytes int, err error) {
 		return
 	}
 
-	numBytes, err = l.out.Write(newlineBytes)
+	_, err = l.out.Write(newlineBytes)
 	if err != nil {
 		return
 	}
 
-	return l.Write(data[excess:])
+	var n int
+	n, err = l.Write(data[excess:]) // recurse
+	numBytes += n
+	return
 }
 
 // Close finalizes the base64LineBreaker, writing any remaining buffered data and appending a newline.

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (l *base64LineBreaker) Write(data []byte) (numBytes int, err error) {`
`50`	`50`	`return len(data), nil`
`51`	`51`	`}`
`52`	`52`
`53`		`- numBytes, err = l.out.Write(l.line[0:l.used])`
	`53`	`+ _, err = l.out.Write(l.line[0:l.used])`
`54`	`54`	`if err != nil {`
`55`	`55`	`return`
`56`	`56`	`}`
`@@ -62,12 +62,15 @@ func (l *base64LineBreaker) Write(data []byte) (numBytes int, err error) {`
`62`	`62`	`return`
`63`	`63`	`}`
`64`	`64`
`65`		`- numBytes, err = l.out.Write(newlineBytes)`
	`65`	`+ _, err = l.out.Write(newlineBytes)`
`66`	`66`	`if err != nil {`
`67`	`67`	`return`
`68`	`68`	`}`
`69`	`69`
`70`		`- return l.Write(data[excess:])`
	`70`	`+ var n int`
	`71`	`+ n, err = l.Write(data[excess:]) // recurse`
	`72`	`+ numBytes += n`
	`73`	`+ return`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`// Close finalizes the base64LineBreaker, writing any remaining buffered data and appending a newline.`