qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 17:30:02 -07:00
Code Releases Activity

vendor/golang_org/x/net/idna: update from upstream

Browse Source 
The only file that really changed is
x/net/idna (upstream 8253218a).

See CL 73730: avoid memory leak in validation codes

The rest is just a small change in the
generation line at the top.

Change-Id: I62c5172f77f63d919c41d11c6db0a9517bc2a221
Reviewed-on: https://go-review.googlesource.com/74953
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Marcel van Lohuizen 2017-11-01 18:45:42 +01:00 committed by Brad Fitzpatrick
parent fbfc2031a6
commit 8d9bb1e1cc
24 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vendor/golang_org/x/net/idna/idna.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
@ -309,7 +309,7 @@ func (p *Profile) process(s string, toASCII bool) (string, error) {
for ; len(s) > 0 && s[0] == '.'; s = s[1:] { for ; len(s) > 0 && s[0] == '.'; s = s[1:] {
} }
} }
// TODO: allow for a quick check the tables data. // TODO: allow for a quick check of the tables data.
// It seems like we should only create this error on ToASCII, but the // It seems like we should only create this error on ToASCII, but the
// UTS 46 conformance tests suggests we should always check this. // UTS 46 conformance tests suggests we should always check this.
if err == nil && p.verifyDNSLength && s == "" { if err == nil && p.verifyDNSLength && s == "" {
@ -405,6 +405,9 @@ func validateRegistration(p *Profile, s string) (idem string, bidi bool, err err
} }
for i := 0; i < len(s); { for i := 0; i < len(s); {
v, sz := trie.lookupString(s[i:]) v, sz := trie.lookupString(s[i:])
if sz == 0 {
return s, bidi, runeError(utf8.RuneError)
}
bidi = bidi || info(v).isBidi(s[i:]) bidi = bidi || info(v).isBidi(s[i:])
// Copy bytes not copied so far. // Copy bytes not copied so far.
switch p.simplify(info(v).category()) { switch p.simplify(info(v).category()) {
@ -446,6 +449,15 @@ func validateAndMap(p *Profile, s string) (vm string, bidi bool, err error) {
var combinedInfoBits info var combinedInfoBits info
for i := 0; i < len(s); { for i := 0; i < len(s); {
v, sz := trie.lookupString(s[i:]) v, sz := trie.lookupString(s[i:])
if sz == 0 {
b = append(b, s[k:i]...)
b = append(b, "\ufffd"...)
k = len(s)
if err == nil {
err = runeError(utf8.RuneError)
}
break
}
combinedInfoBits |= info(v) combinedInfoBits |= info(v)
bidi = bidi || info(v).isBidi(s[i:]) bidi = bidi || info(v).isBidi(s[i:])
start := i start := i
@ -584,6 +596,9 @@ func validateFromPunycode(p *Profile, s string) error {
// loop. // loop.
for i := 0; i < len(s); { for i := 0; i < len(s); {
v, sz := trie.lookupString(s[i:]) v, sz := trie.lookupString(s[i:])
if sz == 0 {
return runeError(utf8.RuneError)
}
if c := p.simplify(info(v).category()); c != valid && c != deviation { if c := p.simplify(info(v).category()); c != valid && c != deviation {
return &labelError{s, "V6"} return &labelError{s, "V6"}
} }

2
src/vendor/golang_org/x/net/idna/punycode.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/net/idna/tables.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // 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. // Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.

2
src/vendor/golang_org/x/net/idna/trie.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/net/idna/trieval.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // 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. // Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.

2
src/vendor/golang_org/x/text/secure/bidirule/bidirule.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/secure/doc.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/transform/transform.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2013 The Go Authors. All rights reserved. // Copyright 2013 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/bidi/bidi.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/bidi/bracket.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/bidi/core.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/bidi/prop.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2016 The Go Authors. All rights reserved. // Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/bidi/tables.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // 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. // Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.

2
src/vendor/golang_org/x/text/unicode/bidi/trieval.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // 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. // Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.

2
src/vendor/golang_org/x/text/unicode/doc.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/composition.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/forminfo.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/input.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/iter.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/normalize.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/readwriter.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/tables.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // 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. // Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.

2
src/vendor/golang_org/x/text/unicode/norm/transform.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2013 The Go Authors. All rights reserved. // Copyright 2013 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style

2
src/vendor/golang_org/x/text/unicode/norm/trie.go vendored
View File

@ -1,4 +1,4 @@
// Code generated by running "go run gen.go -core" in golang.org/x/text. DO NOT EDIT. // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// Copyright 2011 The Go Authors. All rights reserved. // Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style