stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8239457: call ReleaseStringUTFChars before early returns in Java_sun_security_pkcs11_wrapper_PKCS11_connect

Browse Source 
Reviewed-by: alanb, clanger
This commit is contained in:
Matthias Baesken 2020-02-19 13:37:07 +01:00
parent bd028945bd
commit 3f140fafab
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
*/ */
/* Copyright (c) 2002 Graz University of Technology. All rights reserved. /* Copyright (c) 2002 Graz University of Technology. All rights reserved.
@ -93,7 +93,6 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
} }
TRACE1("DEBUG: connect to PKCS#11 module: %s ... ", libraryNameStr); TRACE1("DEBUG: connect to PKCS#11 module: %s ... ", libraryNameStr);
/* /*
* Load the PKCS #11 DLL * Load the PKCS #11 DLL
*/ */
@ -119,6 +118,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
free(exceptionMessage); free(exceptionMessage);
return; return;
} }
(*env)->ReleaseStringUTFChars(env, jPkcs11ModulePath, libraryNameStr);
/* /*
* Get function pointer to C_GetFunctionList * Get function pointer to C_GetFunctionList
@ -156,7 +156,6 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
globalPKCS11ImplementationReference = (*env)->NewGlobalRef(env, obj); globalPKCS11ImplementationReference = (*env)->NewGlobalRef(env, obj);
putModuleEntry(env, globalPKCS11ImplementationReference, moduleData); putModuleEntry(env, globalPKCS11ImplementationReference, moduleData);
(*env)->ReleaseStringUTFChars(env, jPkcs11ModulePath, libraryNameStr);
TRACE0("FINISHED\n"); TRACE0("FINISHED\n");
if(ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; } if(ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) { return; }