From 03e2bf68d69c40c069ddd0e7858d4ff1456bb235 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Mon, 25 Apr 2016 17:06:32 -0700 Subject: [PATCH] vendor: update go-oidc to fix parsing panic --- glide.lock | 6 +++--- glide.yaml | 2 +- vendor/github.com/coreos/go-oidc/oidc/client.go | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/glide.lock b/glide.lock index e1d4b018..5c24621e 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ -hash: b0a1c1b400f077dac572450cb9602aabba62d9b7c6fc8ef426c2093de7621e8c -updated: 2016-04-08T11:43:54.191409294-07:00 +hash: 2542cf3debe2db35e04c4cd29d8db83f7b52d90167f4e55be5a2b24f5b74c65b +updated: 2016-04-25T17:06:03.25154684-07:00 imports: - name: github.com/andybalholm/cascadia version: 6122e68c2642b7b75c538a63b15168c6c80fb757 - name: github.com/coreos/go-oidc - version: 6039032c0b15517897116d333ead8edf38792437 + version: 46fc3c20dcad27d27596c8832b354621bdd8b88f subpackages: - http - jose diff --git a/glide.yaml b/glide.yaml index 905dcc9a..9561bf16 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,7 +5,7 @@ import: - package: github.com/andybalholm/cascadia version: 6122e68c2642b7b75c538a63b15168c6c80fb757 - package: github.com/coreos/go-oidc - version: 6039032c0b15517897116d333ead8edf38792437 + version: 46fc3c20dcad27d27596c8832b354621bdd8b88f subpackages: - http - jose diff --git a/vendor/github.com/coreos/go-oidc/oidc/client.go b/vendor/github.com/coreos/go-oidc/oidc/client.go index 34cb44bb..7a3cb40f 100644 --- a/vendor/github.com/coreos/go-oidc/oidc/client.go +++ b/vendor/github.com/coreos/go-oidc/oidc/client.go @@ -311,7 +311,9 @@ func (p *stickyErrParser) parseURIs(s []string, field string) []url.URL { p.firstErr = fmt.Errorf("invalid URI in field %s", field) return nil } - uris[i] = *(p.parseURI(val, field)) + if u := p.parseURI(val, field); u != nil { + uris[i] = *u + } } return uris }