don't leak cipher handle if newCBC panics

microsoft · Aug 22, 2023 · 8a96154 · 8a96154
1 parent c3d0095
commit 8a96154
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/cng/aes.go b/cng/aes.go
@@ -129,21 +129,22 @@ type cbcCipher struct {
 }
 
 func newCBC(encrypt bool, alg string, key, iv []byte) *cbcCipher {
-	kh, err := newCipherHandle(alg, bcrypt.CHAIN_MODE_CBC, key)
-	if err != nil {
-		panic(err)
-	}
-	x := &cbcCipher{kh: kh, encrypt: encrypt}
+	var blockSize int
 	switch alg {
 	case bcrypt.AES_ALGORITHM:
-		x.blockSize = aesBlockSize
+		blockSize = aesBlockSize
 	case bcrypt.DES_ALGORITHM:
-		x.blockSize = desBlockSize
+		blockSize = desBlockSize
 	default:
 		panic("invalid algorithm: " + alg)
 	}
-	x.SetIV(iv)
+	kh, err := newCipherHandle(alg, bcrypt.CHAIN_MODE_CBC, key)
+	if err != nil {
+		panic(err)
+	}
+	x := &cbcCipher{kh: kh, encrypt: encrypt, blockSize: blockSize}
 	runtime.SetFinalizer(x, (*cbcCipher).finalize)
+	x.SetIV(iv)
 	return x
 }