mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-27 08:40:23 +00:00
build: update vendor with latest version
Updating the version of golang.org/x/text to version v0.3.3.
It fixes the vulnerability in http://golang.org/x/text/encoding/unicode
which leads UTF-16 decoder entering an infinite loop causing
the program to crash or run out of memory.
Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
(cherry picked from commit 8e434bb3ee
)
This commit is contained in:
parent
8170e12114
commit
bef4873049
1
go.mod
1
go.mod
@ -24,6 +24,7 @@ require (
|
|||||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
|
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
|
||||||
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3
|
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3
|
||||||
|
golang.org/x/text v0.3.3 // indirect
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
|
||||||
google.golang.org/appengine v1.6.5 // indirect
|
google.golang.org/appengine v1.6.5 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 // indirect
|
google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 // indirect
|
||||||
|
2
go.sum
2
go.sum
@ -694,6 +694,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
|
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
|
||||||
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
|
92
vendor/golang.org/x/text/encoding/unicode/unicode.go
generated
vendored
92
vendor/golang.org/x/text/encoding/unicode/unicode.go
generated
vendored
@ -6,6 +6,7 @@
|
|||||||
package unicode // import "golang.org/x/text/encoding/unicode"
|
package unicode // import "golang.org/x/text/encoding/unicode"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"unicode/utf16"
|
"unicode/utf16"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
@ -25,15 +26,95 @@ import (
|
|||||||
// the introduction of some kind of error type for conveying the erroneous code
|
// the introduction of some kind of error type for conveying the erroneous code
|
||||||
// point.
|
// point.
|
||||||
|
|
||||||
// UTF8 is the UTF-8 encoding.
|
// UTF8 is the UTF-8 encoding. It neither removes nor adds byte order marks.
|
||||||
var UTF8 encoding.Encoding = utf8enc
|
var UTF8 encoding.Encoding = utf8enc
|
||||||
|
|
||||||
|
// UTF8BOM is an UTF-8 encoding where the decoder strips a leading byte order
|
||||||
|
// mark while the encoder adds one.
|
||||||
|
//
|
||||||
|
// Some editors add a byte order mark as a signature to UTF-8 files. Although
|
||||||
|
// the byte order mark is not useful for detecting byte order in UTF-8, it is
|
||||||
|
// sometimes used as a convention to mark UTF-8-encoded files. This relies on
|
||||||
|
// the observation that the UTF-8 byte order mark is either an illegal or at
|
||||||
|
// least very unlikely sequence in any other character encoding.
|
||||||
|
var UTF8BOM encoding.Encoding = utf8bomEncoding{}
|
||||||
|
|
||||||
|
type utf8bomEncoding struct{}
|
||||||
|
|
||||||
|
func (utf8bomEncoding) String() string {
|
||||||
|
return "UTF-8-BOM"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (utf8bomEncoding) ID() (identifier.MIB, string) {
|
||||||
|
return identifier.Unofficial, "x-utf8bom"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (utf8bomEncoding) NewEncoder() *encoding.Encoder {
|
||||||
|
return &encoding.Encoder{
|
||||||
|
Transformer: &utf8bomEncoder{t: runes.ReplaceIllFormed()},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (utf8bomEncoding) NewDecoder() *encoding.Decoder {
|
||||||
|
return &encoding.Decoder{Transformer: &utf8bomDecoder{}}
|
||||||
|
}
|
||||||
|
|
||||||
var utf8enc = &internal.Encoding{
|
var utf8enc = &internal.Encoding{
|
||||||
&internal.SimpleEncoding{utf8Decoder{}, runes.ReplaceIllFormed()},
|
&internal.SimpleEncoding{utf8Decoder{}, runes.ReplaceIllFormed()},
|
||||||
"UTF-8",
|
"UTF-8",
|
||||||
identifier.UTF8,
|
identifier.UTF8,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type utf8bomDecoder struct {
|
||||||
|
checked bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *utf8bomDecoder) Reset() {
|
||||||
|
t.checked = false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *utf8bomDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
||||||
|
if !t.checked {
|
||||||
|
if !atEOF && len(src) < len(utf8BOM) {
|
||||||
|
if len(src) == 0 {
|
||||||
|
return 0, 0, nil
|
||||||
|
}
|
||||||
|
return 0, 0, transform.ErrShortSrc
|
||||||
|
}
|
||||||
|
if bytes.HasPrefix(src, []byte(utf8BOM)) {
|
||||||
|
nSrc += len(utf8BOM)
|
||||||
|
src = src[len(utf8BOM):]
|
||||||
|
}
|
||||||
|
t.checked = true
|
||||||
|
}
|
||||||
|
nDst, n, err := utf8Decoder.Transform(utf8Decoder{}, dst[nDst:], src, atEOF)
|
||||||
|
nSrc += n
|
||||||
|
return nDst, nSrc, err
|
||||||
|
}
|
||||||
|
|
||||||
|
type utf8bomEncoder struct {
|
||||||
|
written bool
|
||||||
|
t transform.Transformer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *utf8bomEncoder) Reset() {
|
||||||
|
t.written = false
|
||||||
|
t.t.Reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *utf8bomEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
||||||
|
if !t.written {
|
||||||
|
if len(dst) < len(utf8BOM) {
|
||||||
|
return nDst, 0, transform.ErrShortDst
|
||||||
|
}
|
||||||
|
nDst = copy(dst, utf8BOM)
|
||||||
|
t.written = true
|
||||||
|
}
|
||||||
|
n, nSrc, err := utf8Decoder.Transform(utf8Decoder{}, dst[nDst:], src, atEOF)
|
||||||
|
nDst += n
|
||||||
|
return nDst, nSrc, err
|
||||||
|
}
|
||||||
|
|
||||||
type utf8Decoder struct{ transform.NopResetter }
|
type utf8Decoder struct{ transform.NopResetter }
|
||||||
|
|
||||||
func (utf8Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
func (utf8Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
||||||
@ -287,16 +368,13 @@ func (u *utf16Decoder) Reset() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *utf16Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
func (u *utf16Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
|
||||||
if len(src) == 0 {
|
if len(src) < 2 && atEOF && u.current.bomPolicy&requireBOM != 0 {
|
||||||
if atEOF && u.current.bomPolicy&requireBOM != 0 {
|
|
||||||
return 0, 0, ErrMissingBOM
|
return 0, 0, ErrMissingBOM
|
||||||
}
|
}
|
||||||
|
if len(src) == 0 {
|
||||||
return 0, 0, nil
|
return 0, 0, nil
|
||||||
}
|
}
|
||||||
if u.current.bomPolicy&acceptBOM != 0 {
|
if len(src) >= 2 && u.current.bomPolicy&acceptBOM != 0 {
|
||||||
if len(src) < 2 {
|
|
||||||
return 0, 0, transform.ErrShortSrc
|
|
||||||
}
|
|
||||||
switch {
|
switch {
|
||||||
case src[0] == 0xfe && src[1] == 0xff:
|
case src[0] == 0xfe && src[1] == 0xff:
|
||||||
u.current.endianness = BigEndian
|
u.current.endianness = BigEndian
|
||||||
|
6
vendor/golang.org/x/text/transform/transform.go
generated
vendored
6
vendor/golang.org/x/text/transform/transform.go
generated
vendored
@ -648,7 +648,8 @@ func String(t Transformer, s string) (result string, n int, err error) {
|
|||||||
// Transform the remaining input, growing dst and src buffers as necessary.
|
// Transform the remaining input, growing dst and src buffers as necessary.
|
||||||
for {
|
for {
|
||||||
n := copy(src, s[pSrc:])
|
n := copy(src, s[pSrc:])
|
||||||
nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], pSrc+n == len(s))
|
atEOF := pSrc+n == len(s)
|
||||||
|
nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], atEOF)
|
||||||
pDst += nDst
|
pDst += nDst
|
||||||
pSrc += nSrc
|
pSrc += nSrc
|
||||||
|
|
||||||
@ -659,6 +660,9 @@ func String(t Transformer, s string) (result string, n int, err error) {
|
|||||||
dst = grow(dst, pDst)
|
dst = grow(dst, pDst)
|
||||||
}
|
}
|
||||||
} else if err == ErrShortSrc {
|
} else if err == ErrShortSrc {
|
||||||
|
if atEOF {
|
||||||
|
return string(dst[:pDst]), pSrc, err
|
||||||
|
}
|
||||||
if nSrc == 0 {
|
if nSrc == 0 {
|
||||||
src = grow(src, 0)
|
src = grow(src, 0)
|
||||||
}
|
}
|
||||||
|
8
vendor/golang.org/x/text/unicode/bidi/core.go
generated
vendored
8
vendor/golang.org/x/text/unicode/bidi/core.go
generated
vendored
@ -480,15 +480,15 @@ func (s *isolatingRunSequence) resolveWeakTypes() {
|
|||||||
|
|
||||||
// Rule W1.
|
// Rule W1.
|
||||||
// Changes all NSMs.
|
// Changes all NSMs.
|
||||||
preceedingCharacterType := s.sos
|
precedingCharacterType := s.sos
|
||||||
for i, t := range s.types {
|
for i, t := range s.types {
|
||||||
if t == NSM {
|
if t == NSM {
|
||||||
s.types[i] = preceedingCharacterType
|
s.types[i] = precedingCharacterType
|
||||||
} else {
|
} else {
|
||||||
if t.in(LRI, RLI, FSI, PDI) {
|
if t.in(LRI, RLI, FSI, PDI) {
|
||||||
preceedingCharacterType = ON
|
precedingCharacterType = ON
|
||||||
}
|
}
|
||||||
preceedingCharacterType = t
|
precedingCharacterType = t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go
generated
vendored
2
vendor/golang.org/x/text/unicode/bidi/tables11.0.0.go
generated
vendored
@ -1,6 +1,6 @@
|
|||||||
// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
|
// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
|
||||||
|
|
||||||
// +build go1.13
|
// +build go1.13,!go1.14
|
||||||
|
|
||||||
package bidi
|
package bidi
|
||||||
|
|
||||||
|
1923
vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go
generated
vendored
Normal file
1923
vendor/golang.org/x/text/unicode/bidi/tables12.0.0.go
generated
vendored
Normal file
File diff suppressed because it is too large
Load Diff
2
vendor/golang.org/x/text/unicode/norm/tables11.0.0.go
generated
vendored
2
vendor/golang.org/x/text/unicode/norm/tables11.0.0.go
generated
vendored
@ -1,6 +1,6 @@
|
|||||||
// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
|
// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
|
||||||
|
|
||||||
// +build go1.13
|
// +build go1.13,!go1.14
|
||||||
|
|
||||||
package norm
|
package norm
|
||||||
|
|
||||||
|
7710
vendor/golang.org/x/text/unicode/norm/tables12.0.0.go
generated
vendored
Normal file
7710
vendor/golang.org/x/text/unicode/norm/tables12.0.0.go
generated
vendored
Normal file
File diff suppressed because it is too large
Load Diff
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -216,7 +216,7 @@ golang.org/x/sys/cpu
|
|||||||
golang.org/x/sys/internal/unsafeheader
|
golang.org/x/sys/internal/unsafeheader
|
||||||
golang.org/x/sys/unix
|
golang.org/x/sys/unix
|
||||||
golang.org/x/sys/windows
|
golang.org/x/sys/windows
|
||||||
# golang.org/x/text v0.3.2
|
# golang.org/x/text v0.3.3
|
||||||
golang.org/x/text/encoding
|
golang.org/x/text/encoding
|
||||||
golang.org/x/text/encoding/charmap
|
golang.org/x/text/encoding/charmap
|
||||||
golang.org/x/text/encoding/htmlindex
|
golang.org/x/text/encoding/htmlindex
|
||||||
|
Loading…
Reference in New Issue
Block a user