diff options
| author | Gustav Westling <zegl@westling.xyz> | 2018-05-09 19:05:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2018-05-09 22:10:32 +0000 |
| commit | 10529a01fd8b0d5cc07eb3f6aa00a0272597684b (patch) | |
| tree | e002a0fdd1142358e24f5f0207ba5b8dea27dbe5 /src/encoding/base32/base32.go | |
| parent | 0f2d4d00088486297d013fce6235ad0ac01f033e (diff) | |
| download | go-10529a01fd8b0d5cc07eb3f6aa00a0272597684b.tar.xz | |
encoding/base32: handle NoPadding when using buffered encoding in Close
This changes makes encoder.Close aware of how many bytes to write if there
is any data left in the buffer.
Fixes #25295
Change-Id: I4138891359935509cb561c453b8059ba2b9e576b
GitHub-Last-Rev: f374096d2f3cae8635506074f59e1cd440c14844
GitHub-Pull-Request: golang/go#25316
Reviewed-on: https://go-review.googlesource.com/112515
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/encoding/base32/base32.go')
| -rw-r--r-- | src/encoding/base32/base32.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/encoding/base32/base32.go b/src/encoding/base32/base32.go index f3430654e1..09e90eab5f 100644 --- a/src/encoding/base32/base32.go +++ b/src/encoding/base32/base32.go @@ -244,8 +244,9 @@ func (e *encoder) Close() error { // If there's anything left in the buffer, flush it out if e.err == nil && e.nbuf > 0 { e.enc.Encode(e.out[0:], e.buf[0:e.nbuf]) + encodedLen := e.enc.EncodedLen(e.nbuf) e.nbuf = 0 - _, e.err = e.w.Write(e.out[0:8]) + _, e.err = e.w.Write(e.out[0:encodedLen]) } return e.err } |