diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/encoding/ascii85/ascii85.go | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/encoding/ascii85/ascii85.go')
| -rw-r--r-- | src/pkg/encoding/ascii85/ascii85.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/pkg/encoding/ascii85/ascii85.go b/src/pkg/encoding/ascii85/ascii85.go index e2afc5871..60da304b5 100644 --- a/src/pkg/encoding/ascii85/ascii85.go +++ b/src/pkg/encoding/ascii85/ascii85.go @@ -281,6 +281,18 @@ func (d *decoder) Read(p []byte) (n int, err error) { d.nbuf = copy(d.buf[0:], d.buf[nsrc:d.nbuf]) continue // copy out and return } + if ndst == 0 && d.err == nil { + // Special case: input buffer is mostly filled with non-data bytes. + // Filter out such bytes to make room for more input. + off := 0 + for i := 0; i < d.nbuf; i++ { + if d.buf[i] > ' ' { + d.buf[off] = d.buf[i] + off++ + } + } + d.nbuf = off + } } // Out of input, out of decoded output. Check errors. |