Fix potential NPE

peterdettman · peterdettman · commit 7f1ca8bb8b25 · 2025-05-13T18:28:39.000+07:00
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KdfUtil.java b/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KdfUtil.java
@@ -34,16 +34,19 @@ public class KdfUtil
      */
     public static byte[] makeKeyBytes(KEMKDFSpec kdfSpec, byte[] secret)
     {
-        byte[] keyBytes = null;
+        byte[] keyBytes;
         try
         {
             if (kdfSpec == null)
             {
                 keyBytes = new byte[secret.length];
                 System.arraycopy(secret, 0, keyBytes, 0, keyBytes.length);
             }
-
-            keyBytes = makeKeyBytes(kdfSpec.getKdfAlgorithm(), secret, kdfSpec.getOtherInfo(), kdfSpec.getKeySize());
+            else
+            {
+                keyBytes = makeKeyBytes(kdfSpec.getKdfAlgorithm(), secret, kdfSpec.getOtherInfo(),
+                    kdfSpec.getKeySize());
+            }
         }
         finally
         {

Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,19 @@ public class KdfUtil`
`34`	`34`	`*/`
`35`	`35`	`public static byte[] makeKeyBytes(KEMKDFSpec kdfSpec, byte[] secret)`
`36`	`36`	`{`
`37`		`- byte[] keyBytes = null;`
	`37`	`+ byte[] keyBytes;`
`38`	`38`	`try`
`39`	`39`	`{`
`40`	`40`	`if (kdfSpec == null)`
`41`	`41`	`{`
`42`	`42`	`keyBytes = new byte[secret.length];`
`43`	`43`	`System.arraycopy(secret, 0, keyBytes, 0, keyBytes.length);`
`44`	`44`	`}`
`45`		`-`
`46`		`- keyBytes = makeKeyBytes(kdfSpec.getKdfAlgorithm(), secret, kdfSpec.getOtherInfo(), kdfSpec.getKeySize());`
	`45`	`+ else`
	`46`	`+ {`
	`47`	`+ keyBytes = makeKeyBytes(kdfSpec.getKdfAlgorithm(), secret, kdfSpec.getOtherInfo(),`
	`48`	`+ kdfSpec.getKeySize());`
	`49`	`+ }`
`47`	`50`	`}`
`48`	`51`	`finally`
`49`	`52`	`{`