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

8187496: Possible memory leak in java.apple.security.KeychainStore.addItemToKeychain

Browse Source 
Reviewed-by: weijun, mullan, ahgross
This commit is contained in:
Ivan Gerasimov 2017-12-07 11:21:47 -08:00
parent 8ea00aed64
commit 29534320cd
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
View File

@ -438,12 +438,11 @@ JNIEXPORT jbyteArray JNICALL Java_apple_security_KeychainStore__1getEncodedKeyDa
if (passwordChars == NULL) { if (passwordChars == NULL) {
goto errOut; goto errOut;
} }
passwordStrRef = CFStringCreateWithCharacters(kCFAllocatorDefault, passwordChars, passwordLen);
// clear the password and release passwordStrRef = CFStringCreateWithCharactersNoCopy(NULL, passwordChars, passwordLen, kCFAllocatorNull);
memset(passwordChars, 0, passwordLen); if (passwordStrRef == NULL) {
(*env)->ReleaseCharArrayElements(env, passwordObj, passwordChars, goto errOut;
JNI_ABORT); }
} }
} }
@ -471,7 +470,12 @@ JNIEXPORT jbyteArray JNICALL Java_apple_security_KeychainStore__1getEncodedKeyDa
errOut: errOut:
if (exportedData) CFRelease(exportedData); if (exportedData) CFRelease(exportedData);
if (passwordStrRef) CFRelease(passwordStrRef); if (passwordStrRef) CFRelease(passwordStrRef);
if (passwordChars) {
// clear the password and release
memset(passwordChars, 0, passwordLen);
(*env)->ReleaseCharArrayElements(env, passwordObj, passwordChars,
JNI_ABORT);
}
return returnValue; return returnValue;
} }
@ -538,12 +542,11 @@ JNF_COCOA_ENTER(env);
if (passwordChars == NULL) { if (passwordChars == NULL) {
goto errOut; goto errOut;
} }
passwordStrRef = CFStringCreateWithCharacters(kCFAllocatorDefault, passwordChars, passwordLen);
// clear the password and release passwordStrRef = CFStringCreateWithCharactersNoCopy(NULL, passwordChars, passwordLen, kCFAllocatorNull);
memset(passwordChars, 0, passwordLen); if (passwordStrRef == NULL) {
(*env)->ReleaseCharArrayElements(env, passwordObj, passwordChars, goto errOut;
JNI_ABORT); }
} }
} }
@ -581,7 +584,14 @@ JNF_COCOA_ENTER(env);
CFRelease(createdItems); CFRelease(createdItems);
} }
errOut: ; errOut:
if (passwordStrRef) CFRelease(passwordStrRef);
if (passwordChars) {
// clear the password and release
memset(passwordChars, 0, passwordLen);
(*env)->ReleaseCharArrayElements(env, passwordObj, passwordChars,
JNI_ABORT);
}
JNF_COCOA_EXIT(env); JNF_COCOA_EXIT(env);