Commit 8d9bb1e1 authored by Marcel van Lohuizen's avatar Marcel van Lohuizen Committed by Brad Fitzpatrick

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/74953Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent fbfc2031
// 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"}
}
......
// 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
......
// 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 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
......
// 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 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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 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 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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
......
// 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 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
......
// 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment