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

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>

diff --git a/src/vendor/golang_org/x/net/idna/idna.go b/src/vendor/golang_org/x/net/idna/idna.go
index 731282a834134129d928e5d5e8d1b34aed8310fd..9fd0334cd9df0b7c14798f1c07382a2a151d1ae3 100644 (file)
--- a/src/vendor/golang_org/x/net/idna/idna.go
+++ b/src/vendor/golang_org/x/net/idna/idna.go
@@ -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.
 // 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:] {
                }
        }
-       // 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
        // UTS 46 conformance tests suggests we should always check this.
        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); {
                v, sz := trie.lookupString(s[i:])
+               if sz == 0 {
+                       return s, bidi, runeError(utf8.RuneError)
+               }
                bidi = bidi || info(v).isBidi(s[i:])
                // Copy bytes not copied so far.
                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
        for i := 0; i < len(s); {
                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)
                bidi = bidi || info(v).isBidi(s[i:])
                start := i
@@ -584,6 +596,9 @@ func validateFromPunycode(p *Profile, s string) error {
        // loop.
        for i := 0; i < len(s); {
                v, sz := trie.lookupString(s[i:])
+               if sz == 0 {
+                       return runeError(utf8.RuneError)
+               }
                if c := p.simplify(info(v).category()); c != valid && c != deviation {
                        return &labelError{s, "V6"}
                }

diff --git a/src/vendor/golang_org/x/net/idna/punycode.go b/src/vendor/golang_org/x/net/idna/punycode.go
index fab9229881a3ca90089dabe960b92b47ccc09f11..02c7d59af3b417327e3027bd0e0dbd09aa9107e3 100644 (file)
--- a/src/vendor/golang_org/x/net/idna/punycode.go
+++ b/src/vendor/golang_org/x/net/idna/punycode.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/net/idna/tables.go b/src/vendor/golang_org/x/net/idna/tables.go
index c00dc075e906725e794e9109247387bbb72e4bae..a470c5a3e2588d9416a352c52ed04237543e915e 100644 (file)
--- a/src/vendor/golang_org/x/net/idna/tables.go
+++ b/src/vendor/golang_org/x/net/idna/tables.go
@@ -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.
 

diff --git a/src/vendor/golang_org/x/net/idna/trie.go b/src/vendor/golang_org/x/net/idna/trie.go
index 000fb979a0bef6fa2fba1de381f5b9208ac578bf..c4ef847e7a37d62bb63ea5af5393f877d18ad56a 100644 (file)
--- a/src/vendor/golang_org/x/net/idna/trie.go
+++ b/src/vendor/golang_org/x/net/idna/trie.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/net/idna/trieval.go b/src/vendor/golang_org/x/net/idna/trieval.go
index 4bf062ca6423db1ca209e7f2565fb4940303e046..5f4e5f2e7457e323aaedd8508709755d149ebd81 100644 (file)
--- a/src/vendor/golang_org/x/net/idna/trieval.go
+++ b/src/vendor/golang_org/x/net/idna/trieval.go
@@ -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.
 

diff --git a/src/vendor/golang_org/x/text/secure/bidirule/bidirule.go b/src/vendor/golang_org/x/text/secure/bidirule/bidirule.go
index b2350fe1cbbcfa1bafed1348e1beae3a61d40c89..c3ca2bc6fede0e5904a7fbc1bd46244cd6dcdca5 100644 (file)
--- a/src/vendor/golang_org/x/text/secure/bidirule/bidirule.go
+++ b/src/vendor/golang_org/x/text/secure/bidirule/bidirule.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/secure/doc.go b/src/vendor/golang_org/x/text/secure/doc.go
index 4912b9b9a763e51590872a0fa7422d90db3d59c6..5eb60b94bf275278ca8566e450529ad9a5479a88 100644 (file)
--- a/src/vendor/golang_org/x/text/secure/doc.go
+++ b/src/vendor/golang_org/x/text/secure/doc.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/transform/transform.go b/src/vendor/golang_org/x/text/transform/transform.go
index 2a1b190b0d73c88f1b4590ebfb87cbcc7ba5896b..9ddfa80cf3e69f0c7d939c3064a79b7c871e1b1f 100644 (file)
--- a/src/vendor/golang_org/x/text/transform/transform.go
+++ b/src/vendor/golang_org/x/text/transform/transform.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/bidi.go b/src/vendor/golang_org/x/text/unicode/bidi/bidi.go
index 4c9735ef0b0549d8ce6698658e5fc7aa6c16f786..e691ae86942b1829db352e0e884a298467d0613f 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/bidi.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/bidi.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/bracket.go b/src/vendor/golang_org/x/text/unicode/bidi/bracket.go
index f08a93d9bee86e6343e14e93d7803173446d38a4..0784e797b7288c2ec2f0a0d6744723c2f6a1e503 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/bracket.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/bracket.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/core.go b/src/vendor/golang_org/x/text/unicode/bidi/core.go
index a352ad622a9b31e4d260051dd205cfb857c9c07e..9a934b8430d87cf5b8cb3bbdd744ffb595c99172 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/core.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/core.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/prop.go b/src/vendor/golang_org/x/text/unicode/bidi/prop.go
index ed191c220d38236a49d9c9a6f350bbae8fdba1e5..878b8c41b94dc819b698bcc48f9c86fe3eb50924 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/prop.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/prop.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/tables.go b/src/vendor/golang_org/x/text/unicode/bidi/tables.go
index 89fa7a1d8987b994af339ef3c535afa7c782c37f..fb2229efa875c6e98fc2e0c1fefc6438b4a46e15 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/tables.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/tables.go
@@ -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.
 

diff --git a/src/vendor/golang_org/x/text/unicode/bidi/trieval.go b/src/vendor/golang_org/x/text/unicode/bidi/trieval.go
index a825fdea4d0e7dfaa64cbfe2f64025de26220983..c3f0e21f3e8791311a5a44d2a2d8a12bc5371584 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/bidi/trieval.go
+++ b/src/vendor/golang_org/x/text/unicode/bidi/trieval.go
@@ -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.
 

diff --git a/src/vendor/golang_org/x/text/unicode/doc.go b/src/vendor/golang_org/x/text/unicode/doc.go
index 36b462a3e13cd37a929f6090b51e72f5cf20d12a..55a6775d59a38b29a4bb66f876e2e4e3306c2ed4 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/doc.go
+++ b/src/vendor/golang_org/x/text/unicode/doc.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/composition.go b/src/vendor/golang_org/x/text/unicode/norm/composition.go
index a0a9d061226de35901106e1bed9866a009cab51f..80287d2d5d398b303b1ad02c8fce0969eea50e7c 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/composition.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/composition.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/forminfo.go b/src/vendor/golang_org/x/text/unicode/norm/forminfo.go
index f3e2930daf2589a0d1303b2dc0d6dd60bcdd9b0d..64558400721e1aa80878a1ac0ae964dff14e9dd4 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/forminfo.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/forminfo.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/input.go b/src/vendor/golang_org/x/text/unicode/norm/input.go
index 3473f2c1c5bc5319ab5987ac1b1d1df6d9c48b88..315f6fcaa1f286c716b4842dfadc24e56fd77003 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/input.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/input.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/iter.go b/src/vendor/golang_org/x/text/unicode/norm/iter.go
index 75243bbd69d74fea44d6c78ff2c4781b74fccfc0..d0ae6cbc1ba12753447afc676ae13080715819de 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/iter.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/iter.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/normalize.go b/src/vendor/golang_org/x/text/unicode/norm/normalize.go
index 51e161abb90e32c91eddac2b31aa3fe2327609bf..4de4ed6ed0f9dd79a7d4e2bdcc182788dc66ca76 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/normalize.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/normalize.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/readwriter.go b/src/vendor/golang_org/x/text/unicode/norm/readwriter.go
index 482ac85c745f5c0e0238e8ec8a5a9e3c8739f7ba..068ab57153c2ea5ba497b657e05bc18e1c098e37 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/readwriter.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/readwriter.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/tables.go b/src/vendor/golang_org/x/text/unicode/norm/tables.go
index aa23cc61d11b7016e8c2572d2f1b235df2034f0d..d6466836cefe62e51b367484ef404c2d8752c3c4 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/tables.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/tables.go
@@ -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.
 

diff --git a/src/vendor/golang_org/x/text/unicode/norm/transform.go b/src/vendor/golang_org/x/text/unicode/norm/transform.go
index 0ea6efacf57ed688870dd8842435e2691bccc2da..73869a5a1cddb1f75a1dcc96bc15b803bd902596 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/transform.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/transform.go
@@ -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.
 // Use of this source code is governed by a BSD-style

diff --git a/src/vendor/golang_org/x/text/unicode/norm/trie.go b/src/vendor/golang_org/x/text/unicode/norm/trie.go
index 4cbea644a1d99c6106c1d50487e01025339e9418..761439ce5922a883952f2078438332470e551f10 100644 (file)
--- a/src/vendor/golang_org/x/text/unicode/norm/trie.go
+++ b/src/vendor/golang_org/x/text/unicode/norm/trie.go
@@ -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.
 // Use of this source code is governed by a BSD-style