Merge pull request #430 from ericchiang/update_go-oidc

vendor: update go-oidc to fix parsing panic
This commit is contained in:
Eric Chiang 2016-04-25 17:16:09 -07:00
commit ba5021a889
3 changed files with 7 additions and 5 deletions

6
glide.lock generated
View file

@ -1,10 +1,10 @@
hash: b0a1c1b400f077dac572450cb9602aabba62d9b7c6fc8ef426c2093de7621e8c hash: 2542cf3debe2db35e04c4cd29d8db83f7b52d90167f4e55be5a2b24f5b74c65b
updated: 2016-04-08T11:43:54.191409294-07:00 updated: 2016-04-25T17:06:03.25154684-07:00
imports: imports:
- name: github.com/andybalholm/cascadia - name: github.com/andybalholm/cascadia
version: 6122e68c2642b7b75c538a63b15168c6c80fb757 version: 6122e68c2642b7b75c538a63b15168c6c80fb757
- name: github.com/coreos/go-oidc - name: github.com/coreos/go-oidc
version: 6039032c0b15517897116d333ead8edf38792437 version: 46fc3c20dcad27d27596c8832b354621bdd8b88f
subpackages: subpackages:
- http - http
- jose - jose

View file

@ -5,7 +5,7 @@ import:
- package: github.com/andybalholm/cascadia - package: github.com/andybalholm/cascadia
version: 6122e68c2642b7b75c538a63b15168c6c80fb757 version: 6122e68c2642b7b75c538a63b15168c6c80fb757
- package: github.com/coreos/go-oidc - package: github.com/coreos/go-oidc
version: 6039032c0b15517897116d333ead8edf38792437 version: 46fc3c20dcad27d27596c8832b354621bdd8b88f
subpackages: subpackages:
- http - http
- jose - jose

View file

@ -311,7 +311,9 @@ func (p *stickyErrParser) parseURIs(s []string, field string) []url.URL {
p.firstErr = fmt.Errorf("invalid URI in field %s", field) p.firstErr = fmt.Errorf("invalid URI in field %s", field)
return nil return nil
} }
uris[i] = *(p.parseURI(val, field)) if u := p.parseURI(val, field); u != nil {
uris[i] = *u
}
} }
return uris return uris
} }