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

8068024: Null pointer dereference in jdk/src/macosx/native/apple/security/KeystoreImpl.m

Browse Source 
Reviewed-by: weijun
This commit is contained in:
Ivan Gerasimov 2017-11-22 16:31:28 -08:00
parent 3dbde6779a
commit 4b37f67bf9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,6 +24,7 @@
*/
#import "apple_security_KeychainStore.h"
#import "jni_util.h"
#import <Security/Security.h>
#import <Security/SecImportExport.h>
@ -52,6 +53,11 @@ static jstring getLabelFromItem(JNIEnv *env, SecKeychainItemRef inItem)
}
attribCString = malloc(itemAttrs[0].length + 1);
if (attribCString == NULL) {
JNU_ThrowOutOfMemoryError(env, "native heap");
goto errOut;
}
strncpy(attribCString, itemAttrs[0].data, itemAttrs[0].length);
attribCString[itemAttrs[0].length] = '\0';
returnValue = (*env)->NewStringUTF(env, attribCString);
@ -478,6 +484,8 @@ JNIEXPORT void JNICALL Java_apple_security_KeychainStore__1scanKeychain
// again later as a certificate.
addIdentitiesToKeystore(env, this);
JNU_CHECK_EXCEPTION(env);
// Scan current keychain for trusted certificates.
addCertificatesToKeystore(env, this);