diff options
| author | Pete Bentley <prb@google.com> | 2021-08-02 13:29:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-02 13:29:43 +0000 |
| commit | 6641a3d5c5078b32918dad1f0de4c4632b576675 (patch) | |
| tree | 690c11243958dfe1143eeb15386d110dfec9f79b | |
| parent | f0bb77ffcd0418220d2678d6b323c123ec160396 (diff) | |
| parent | 3a83c47b4dccc8f3d0fba6b0b3d126821200ed1c (diff) | |
| download | conscrypt-6641a3d5c5078b32918dad1f0de4c4632b576675.tar.gz | |
Fix CheckJNI error am: 3a83c47b4d
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/1783629
Change-Id: I1cda4996550e54021b9d9c8c3d7f9546bb5219f7
| -rw-r--r-- | common/src/jni/main/cpp/conscrypt/native_crypto.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/src/jni/main/cpp/conscrypt/native_crypto.cc b/common/src/jni/main/cpp/conscrypt/native_crypto.cc index d4428310..e8bb5a37 100644 --- a/common/src/jni/main/cpp/conscrypt/native_crypto.cc +++ b/common/src/jni/main/cpp/conscrypt/native_crypto.cc @@ -9419,11 +9419,12 @@ static jlong NativeCrypto_d2i_SSL_SESSION(JNIEnv* env, jclass, jbyteArray javaBy static jstring NativeCrypto_SSL_CIPHER_get_kx_name(JNIEnv* env, jclass, jlong cipher_address) { CHECK_ERROR_QUEUE_ON_RETURN; - const SSL_CIPHER* cipher = to_SSL_CIPHER(env, cipher_address, true); - const char* kx_name = nullptr; - - kx_name = SSL_CIPHER_get_kx_name(cipher); + const SSL_CIPHER* cipher = to_SSL_CIPHER(env, cipher_address, /*throwIfNull=*/true); + if (cipher == nullptr) { + return nullptr; + } + const char* kx_name = SSL_CIPHER_get_kx_name(cipher); return env->NewStringUTF(kx_name); } |