aboutsummaryrefslogtreecommitdiffstats
path: root/Godeps/_workspace/src/golang.org/x/text/encoding/unicode
diff options
context:
space:
mode:
Diffstat (limited to 'Godeps/_workspace/src/golang.org/x/text/encoding/unicode')
-rw-r--r--Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go b/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go
index 46622013c..f3f2c4eb0 100644
--- a/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go
+++ b/Godeps/_workspace/src/golang.org/x/text/encoding/unicode/unicode.go
@@ -25,9 +25,6 @@ import (
// the introduction of some kind of error type for conveying the erroneous code
// point.
-// TODO:
-// - Define UTF-32?
-
// UTF8 is the UTF-8 encoding.
var UTF8 encoding.Encoding = utf8enc
@@ -290,6 +287,12 @@ func (u *utf16Decoder) Reset() {
}
func (u *utf16Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+ if len(src) == 0 {
+ if atEOF && u.current.bomPolicy&requireBOM != 0 {
+ return 0, 0, ErrMissingBOM
+ }
+ return 0, 0, nil
+ }
if u.current.bomPolicy&acceptBOM != 0 {
if len(src) < 2 {
return 0, 0, transform.ErrShortSrc