andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

We need to use NewGloblRef when caching jclass instances (#9595)

Browse Source 
Motivation:

It is not safe to cache a jclass without obtaining a global reference via NewGlobalRef.

Modifications:

Correctly use NewGlobalRef(...) before caching

Result:

Correctly cache jclass instance
This commit is contained in:
Norman Maurer 2019-09-23 12:47:58 +02:00 committed by GitHub
parent 4499384135
commit dc4de7fbb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
transport-native-kqueue/src/main/c/netty_kqueue_bsdsocket.c
View File

@ -33,7 +33,7 @@
#include "netty_unix_util.h" #include "netty_unix_util.h"
// Those are initialized in the init(...) method and cached for performance reasons // Those are initialized in the init(...) method and cached for performance reasons
static jclass stringCls = NULL; static jclass stringClass = NULL;
static jclass peerCredentialsClass = NULL; static jclass peerCredentialsClass = NULL;
static jfieldID fileChannelFieldId = NULL; static jfieldID fileChannelFieldId = NULL;
static jfieldID transferredFieldId = NULL; static jfieldID transferredFieldId = NULL;
@ -108,7 +108,7 @@ static jobjectArray netty_kqueue_bsdsocket_getAcceptFilter(JNIEnv* env, jclass c
netty_unix_errors_throwChannelExceptionErrorNo(env, "getsockopt() failed: ", errno); netty_unix_errors_throwChannelExceptionErrorNo(env, "getsockopt() failed: ", errno);
return NULL; return NULL;
} }
jobjectArray resultArray = (*env)->NewObjectArray(env, 2, stringCls, NULL); jobjectArray resultArray = (*env)->NewObjectArray(env, 2, stringClass, NULL);
(*env)->SetObjectArrayElement(env, resultArray, 0, (*env)->NewStringUTF(env, &af.af_name[0])); (*env)->SetObjectArrayElement(env, resultArray, 0, (*env)->NewStringUTF(env, &af.af_name[0]));
(*env)->SetObjectArrayElement(env, resultArray, 1, (*env)->NewStringUTF(env, &af.af_arg[0])); (*env)->SetObjectArrayElement(env, resultArray, 1, (*env)->NewStringUTF(env, &af.af_arg[0]));
return resultArray; return resultArray;
@ -272,11 +272,16 @@ jint netty_kqueue_bsdsocket_JNI_OnLoad(JNIEnv* env, const char* packagePrefix) {
netty_unix_errors_throwRuntimeException(env, "failed to get field ID: FileDescriptor.fd"); netty_unix_errors_throwRuntimeException(env, "failed to get field ID: FileDescriptor.fd");
return JNI_ERR; return JNI_ERR;
} }
stringCls = (*env)->FindClass(env, "java/lang/String"); jclass stringCls = (*env)->FindClass(env, "java/lang/String");
if (stringCls == NULL) { if (stringCls == NULL) {
// pending exception... // pending exception...
return JNI_ERR; return JNI_ERR;
} }
if ((stringClass = (*env)->NewGlobalRef(env, stringCls)) == NULL) {
// out-of-memory!
netty_unix_errors_throwOutOfMemoryError(env);
return JNI_ERR;
}
nettyClassName = netty_unix_util_prepend(packagePrefix, "io/netty/channel/unix/PeerCredentials"); nettyClassName = netty_unix_util_prepend(packagePrefix, "io/netty/channel/unix/PeerCredentials");
jclass localPeerCredsClass = (*env)->FindClass(env, nettyClassName); jclass localPeerCredsClass = (*env)->FindClass(env, nettyClassName);
@ -306,4 +311,8 @@ void netty_kqueue_bsdsocket_JNI_OnUnLoad(JNIEnv* env) {
(*env)->DeleteGlobalRef(env, peerCredentialsClass); (*env)->DeleteGlobalRef(env, peerCredentialsClass);
peerCredentialsClass = NULL; peerCredentialsClass = NULL;
} }
if (stringClass != NULL) {
(*env)->DeleteGlobalRef(env, stringClass);
stringClass = NULL;
}
} }