Fix PQC Memory leak issues.

Make fixes found by zOS. That could or will cause
a memory leak.

Signed-off-by: johnpeck-us-ibm <johnpeck@us.ibm.com>

Author: johnpeck-us-ibm

src/main/native/KEM.c

@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2025
+ * Copyright IBM Corp. 2025, 2026
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms provided by IBM in the LICENSE file that accompanied
@@ -67,7 +67,7 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_KEM_1encapsulate(
             free(wrappedKeyLocal);
         }
         if (genkeylocal != NULL) {
-            free(wrappedKeyLocal);
+            free(genkeylocal);
         }
         ICC_EVP_PKEY_CTX_free(ockCtx, evp_pk);
         throwOCKException(env, 0, "malloc failed");

src/main/native/MLKey.c

@@ -1,5 +1,5 @@
 /*
- * Copyright IBM Corp. 2025
+ * Copyright IBM Corp. 2025, 2026
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms provided by IBM in the LICENSE file that accompanied
@@ -373,49 +373,45 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_MLKEY_1createPrivateKey(
         return mlkeyId;
     }
 
-    keyBytesNative = (unsigned char *)((*env)->GetPrimitiveArrayCritical(
-        env, privateKeyBytes, &isCopy));
-    if (NULL == keyBytesNative) {
-        throwOCKException(env, 0, "NULL from GetPrimitiveArrayCritical!");
-    } else {
-        pBytes = keyBytesNative;
-        size   = (*env)->GetArrayLength(env, privateKeyBytes);
-        if (cipherName == NULL) {
+    if (!(algoChars = (*env)->GetStringUTFChars(env, cipherName, NULL))) {
 #ifdef DEBUG_PQC_KEY_DETAIL
-            if (debug) {
-                gslogMessage("cipherName = NULL");
-            }
-#endif
-            (*env)->ReleasePrimitiveArrayCritical(env, privateKeyBytes,
-                                                  keyBytesNative, JNI_ABORT);
-            return 0;
+        if (debug) {
+            gslogMessage("GetStringUTFChars failed %s", cipherName);
         }
-
-        if (!(algoChars = (*env)->GetStringUTFChars(env, cipherName, NULL))) {
-#ifdef DEBUG_PQC_KEY_DETAIL
-            if (debug) {
-                gslogMessage("GetStringUTFChars failed %s", cipherName);
-            }
 #endif
-            (*env)->ReleasePrimitiveArrayCritical(env, privateKeyBytes,
-                                                  keyBytesNative, JNI_ABORT);
-            return 0;
-        }
-        nid = ICC_OBJ_txt2nid(ockCtx, algoChars);
+        return 0;
+    }
 
-        if (!nid) {
-            throwOCKException(
-                env, 0, "Algorithm not found."); /* Unsupported algorithm */
-        } else {
-            ockPKey =
-                ICC_d2i_PrivateKey(ockCtx, nid, &ockPKey, &pBytes, (long)size);
+    nid = ICC_OBJ_txt2nid(ockCtx, algoChars);
 
-            if (ockPKey == NULL) {
-                ockCheckStatus(ockCtx);
-                throwOCKException(env, 0, "ICC_d2i_PrivateKey failed");
+    if (!nid) {
+        throwOCKException(
+            env, 0, "Algorithm not found."); /* Unsupported algorithm */
+    } else {
+        keyBytesNative = (unsigned char *)((*env)->GetPrimitiveArrayCritical(
+            env, privateKeyBytes, &isCopy));
+
+        if (NULL != keyBytesNative) {
+            pBytes = keyBytesNative;
+            size   = (*env)->GetArrayLength(env, privateKeyBytes);
+
+            if (cipherName != NULL) {
+                ockPKey =
+                    ICC_d2i_PrivateKey(ockCtx, nid, &ockPKey, &pBytes, (long)size);
+
+                if (ockPKey == NULL) {
+                    ockCheckStatus(ockCtx);
+                    throwOCKException(env, 0, "ICC_d2i_PrivateKey failed");
+                } else {
+                    mlkeyId = (jlong)((intptr_t)ockPKey);
+                }
             } else {
-                mlkeyId = (jlong)((intptr_t)ockPKey);
-            }
+#ifdef DEBUG_PQC_KEY_DETAIL
+                if (debug) {
+                    gslogMessage("cipherName = NULL");
+                }
+#endif
+            } 
         }
     }
 
@@ -653,7 +649,7 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_MLKEY_1getPublicKeyBytes(
         (*env)->DeleteLocalRef(env, keyBytes);
     }
 
-    return keyBytes;
+    return retKeyBytes;
 }
 
 //============================================================================

src/main/native/SignaturePQC.c

@@ -177,7 +177,7 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_PQC_1SIGNATURE_1verify(
             env, data, &isCopy));
 
         if (dataNative == NULL) {
-            (*env)->ReleasePrimitiveArrayCritical(env, data, dataNative,
+            (*env)->ReleasePrimitiveArrayCritical(env, sigBytes, sigBytesNative,
                                                   JNI_ABORT);
             throwOCKException(env, 0, "GetPrimitiveArrayCritical failed");
             return verified;