void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some JNI error checking

Browse source
This commit is contained in:
Grant Limberg 2018-02-12 09:29:44 -08:00
parent f049740ae5
commit 8828fc7520
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -120,6 +120,11 @@ namespace {
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if (ref->configListener == NULL) {
LOGE("configListener is NULL");
return -1;
}
jclass configListenerClass = env->GetObjectClass(ref->configListener); jclass configListenerClass = env->GetObjectClass(ref->configListener);
if(configListenerClass == NULL) if(configListenerClass == NULL)
{ {
@ -169,13 +174,19 @@ namespace {
unsigned int frameLength) unsigned int frameLength)
{ {
LOGV("VirtualNetworkFrameFunctionCallback"); LOGV("VirtualNetworkFrameFunctionCallback");
#ifndef NDEBUG
unsigned char* local = (unsigned char*)frameData; unsigned char* local = (unsigned char*)frameData;
LOGV("Type Bytes: 0x%02x%02x", local[12], local[13]); LOGV("Type Bytes: 0x%02x%02x", local[12], local[13]);
#endif
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if (ref->frameListener == NULL) {
LOGE("frameListener is NULL");
return;
}
jclass frameListenerClass = env->GetObjectClass(ref->frameListener); jclass frameListenerClass = env->GetObjectClass(ref->frameListener);
if(env->ExceptionCheck() || frameListenerClass == NULL) if(env->ExceptionCheck() || frameListenerClass == NULL)
@ -228,6 +239,10 @@ namespace {
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void **) &env, JNI_VERSION_1_6); ref->jvm->GetEnv((void **) &env, JNI_VERSION_1_6);
if (ref->eventListener == NULL) {
LOGE("eventListener is NULL");
return;
}
jclass eventListenerClass = env->GetObjectClass(ref->eventListener); jclass eventListenerClass = env->GetObjectClass(ref->eventListener);
if (eventListenerClass == NULL) { if (eventListenerClass == NULL) {
@ -332,10 +347,19 @@ namespace {
return; return;
} }
if (strlen(p) < 1) {
return;
}
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if (ref->dataStorePutListener == NULL) {
LOGE("dataStorePutListener is NULL");
return;
}
jclass dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener); jclass dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener);
if (dataStorePutClass == NULL) if (dataStorePutClass == NULL)
{ {
@ -416,10 +440,19 @@ namespace {
return -1; return -1;
} }
if (strlen(p) < 1) {
return -1;
}
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if (ref->dataStoreGetListener == NULL) {
LOGE("dataStoreGetListener is NULL");
return -2;
}
jclass dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener); jclass dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
if(dataStoreGetClass == NULL) if(dataStoreGetClass == NULL)
{ {
@ -487,6 +520,10 @@ namespace {
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if (ref->packetSender == NULL) {
LOGE("packetSender is NULL");
return -1;
}
jclass packetSenderClass = env->GetObjectClass(ref->packetSender); jclass packetSenderClass = env->GetObjectClass(ref->packetSender);
if(packetSenderClass == NULL) if(packetSenderClass == NULL)