Merge pull request #27 from ThalesIgnite/fix-error-hiding

Avoid trampling on existing errors in defer funcs
ThalesGroup · Jan 25, 2019 · 529d2c9 · 529d2c9
2 parents 7e30ee9 + 45cf98d
commit 529d2c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/crypto11.go b/crypto11.go
@@ -292,7 +292,10 @@ func ConfigureFromFile(configLocation string) (ctx *pkcs11.Ctx, err error) {
 		return nil, err
 	}
 	defer func() {
-		err = file.Close()
+		closeErr := file.Close()
+		if err == nil {
+			err = closeErr
+		}
 	}()
 
 	configDecoder := json.NewDecoder(file)

diff --git a/keys.go b/keys.go
@@ -65,7 +65,10 @@ func findKey(session *PKCS11Session, id []byte, label []byte, keyclass uint, key
 		return 0, err
 	}
 	defer func() {
-		err = session.Ctx.FindObjectsFinal(session.Handle)
+		finalErr := session.Ctx.FindObjectsFinal(session.Handle)
+		if err == nil {
+			err = finalErr
+		}
 	}()
 	if handles, _, err = session.Ctx.FindObjects(session.Handle, 1); err != nil {
 		return 0, err