skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Can't reuse original env.

Browse Source
This commit is contained in:
Maarten Billemont
2019-09-27 22:34:28 -04:00
parent fabb9a032d
commit a9ae10d08b
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
platform-independent/c/core/src/mpw-jni.c
View File

@@ -7,27 +7,30 @@
// TODO: We may need to zero the jbytes safely. // TODO: We may need to zero the jbytes safely.
static JavaVM* _vm;
static jobject logger; static jobject logger;
static JNIEnv *env;
static int counter;
void mpw_log_app(LogLevel level, const char *format, ...) { void mpw_log_app(LogLevel level, const char *format, ...) {
JNIEnv *env;
if ((*_vm)->GetEnv( _vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
return;
va_list args; va_list args;
va_start( args, format ); va_start( args, format );
if (logger && (*env)->PushLocalFrame( env, 16 ) == OK) { if (logger && (*env)->PushLocalFrame( env, 16 ) == OK) {
jmethodID method = NULL; jmethodID method = NULL;
jclass class = (*env)->GetObjectClass( env, logger ); jclass Logger = (*env)->GetObjectClass( env, logger );
if (level >= LogLevelTrace) if (level >= LogLevelTrace)
method = (*env)->GetMethodID( env, class, "trace", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, Logger, "trace", "(Ljava/lang/String;)V" );
else if (level == LogLevelDebug) else if (level == LogLevelDebug)
method = (*env)->GetMethodID( env, class, "debug", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, Logger, "debug", "(Ljava/lang/String;)V" );
else if (level == LogLevelInfo) else if (level == LogLevelInfo)
method = (*env)->GetMethodID( env, class, "info", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, Logger, "info", "(Ljava/lang/String;)V" );
else if (level == LogLevelWarning) else if (level == LogLevelWarning)
method = (*env)->GetMethodID( env, class, "warn", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, Logger, "warn", "(Ljava/lang/String;)V" );
else if (level <= LogLevelError) else if (level <= LogLevelError)
method = (*env)->GetMethodID( env, class, "error", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, Logger, "error", "(Ljava/lang/String;)V" );
va_list _args; va_list _args;
va_copy( _args, args ); va_copy( _args, args );
@@ -35,9 +38,10 @@ void mpw_log_app(LogLevel level, const char *format, ...) {
va_end( _args ); va_end( _args );
if (length > 0) { if (length > 0) {
char *message = malloc( length + 1 ); size_t size = (size_t) (length + 1);
char *message = malloc( size );
va_copy( _args, args ); va_copy( _args, args );
if (message && (length = vsnprintf( message, length + 1, format, _args )) > 0) if (message && (length = vsnprintf( message, size, format, _args )) > 0)
(*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, message ) ); (*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, message ) );
va_end( _args ); va_end( _args );
mpw_free( &message, (size_t)max( 0, length ) ); mpw_free( &message, (size_t)max( 0, length ) );
@@ -53,27 +57,28 @@ void mpw_log_app(LogLevel level, const char *format, ...) {
} }
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
if ((*vm)->GetEnv( vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK) JNIEnv *env;
if ((*vm)->GetEnv( _vm = vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
return -1; return -1;
jclass class = (*env)->FindClass( env, "org/slf4j/LoggerFactory" ); jclass LoggerFactory = (*env)->FindClass( env, "org/slf4j/LoggerFactory" );
jmethodID method = (*env)->GetStaticMethodID( env, class, "getLogger", "(Ljava/lang/String;)Lorg/slf4j/Logger;" ); jmethodID method = (*env)->GetStaticMethodID( env, LoggerFactory, "getLogger", "(Ljava/lang/String;)Lorg/slf4j/Logger;" );
jstring name = (*env)->NewStringUTF( env, "com.lyndir.masterpassword.algorithm" ); jstring name = (*env)->NewStringUTF( env, "com.lyndir.masterpassword.algorithm" );
if (class && method && name) if (LoggerFactory && method && name)
logger = (*env)->NewGlobalRef( env, (*env)->CallStaticObjectMethod( env, class, method, name ) ); logger = (*env)->NewGlobalRef( env, (*env)->CallStaticObjectMethod( env, LoggerFactory, method, name ) );
else else
wrn( "Couldn't initialize JNI logger." ); wrn( "Couldn't initialize JNI logger." );
class = (*env)->GetObjectClass( env, logger ); jclass Logger = (*env)->GetObjectClass( env, logger );
if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, class, "isTraceEnabled", "()Z" ) )) if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isTraceEnabled", "()Z" ) ))
mpw_verbosity = LogLevelTrace; mpw_verbosity = LogLevelTrace;
else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, class, "isDebugEnabled", "()Z" ) )) else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isDebugEnabled", "()Z" ) ))
mpw_verbosity = LogLevelDebug; mpw_verbosity = LogLevelDebug;
else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, class, "isInfoEnabled", "()Z" ) )) else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isInfoEnabled", "()Z" ) ))
mpw_verbosity = LogLevelInfo; mpw_verbosity = LogLevelInfo;
else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, class, "isWarnEnabled", "()Z" ) )) else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isWarnEnabled", "()Z" ) ))
mpw_verbosity = LogLevelWarning; mpw_verbosity = LogLevelWarning;
else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, class, "isErrorEnabled", "()Z" ) )) else if ((*env)->CallBooleanMethod( env, logger, (*env)->GetMethodID( env, Logger, "isErrorEnabled", "()Z" ) ))
mpw_verbosity = LogLevelError; mpw_verbosity = LogLevelError;
else else
mpw_verbosity = LogLevelFatal; mpw_verbosity = LogLevelFatal;