scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 11:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

audit: Guard against a few nil pointer cases

Browse Source
This commit is contained in:
Armon Dadgar
2015-04-24 11:39:17 -07:00
committed by Mitchell Hashimoto
parent cee1d20015
commit 139a8db461
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
audit/hashstructure.go
View File

@@ -22,6 +22,9 @@ func Hash(raw interface{}) error {
switch s := raw.(type) { switch s := raw.(type) {
case *logical.Auth: case *logical.Auth:
if s == nil {
return nil
}
if s.ClientToken != "" { if s.ClientToken != "" {
token, err := fn(s.ClientToken) token, err := fn(s.ClientToken)
if err != nil { if err != nil {
@@ -31,6 +34,9 @@ func Hash(raw interface{}) error {
s.ClientToken = token s.ClientToken = token
} }
case *logical.Request: case *logical.Request:
if s == nil {
return nil
}
if s.Auth != nil { if s.Auth != nil {
if err := Hash(s.Auth); err != nil { if err := Hash(s.Auth); err != nil {
return err return err
@@ -44,6 +50,9 @@ func Hash(raw interface{}) error {
s.Data = data.(map[string]interface{}) s.Data = data.(map[string]interface{})
case *logical.Response: case *logical.Response:
if s == nil {
return nil
}
if s.Auth != nil { if s.Auth != nil {
if err := Hash(s.Auth); err != nil { if err := Hash(s.Auth); err != nil {
return err return err