skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix vsnprintf args reuse, size & break before va_end.

Browse Source
This commit is contained in:
Maarten Billemont 2019-09-25 22:49:56 -04:00
parent 2bbd2549a1
commit a132e03b88
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,20 +29,25 @@ void mpw_log_app(LogLevel level, const char *format, ...) {
else if (level <= LogLevelError) else if (level <= LogLevelError)
method = (*env)->GetMethodID( env, class, "error", "(Ljava/lang/String;)V" ); method = (*env)->GetMethodID( env, class, "error", "(Ljava/lang/String;)V" );
int length = vsnprintf( NULL, 0, format, args ); va_list _args;
va_copy( _args, args );
int length = vsnprintf( NULL, 0, format, _args );
va_end( _args );
if (length > 0) { if (length > 0) {
char *message = malloc( length + 1 ); char *message = malloc( length + 1 );
if (message && (length = vsnprintf( message, length, format, args )) > 0); va_copy( _args, args );
if (message && (length = vsnprintf( message, length + 1, format, _args )) > 0);
(*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, message ) ); (*env)->CallVoidMethod( env, logger, method, (*env)->NewStringUTF( env, message ) );
va_end( _args );
mpw_free( &message, (size_t)max( 0, length ) ); mpw_free( &message, (size_t)max( 0, length ) );
} }
(*env)->PopLocalFrame( env, NULL ); (*env)->PopLocalFrame( env, NULL );
return;
} }
else
// Can't log via slf4j, fall back to cli logger. // Can't log via slf4j, fall back to cli logger.
mpw_vlog_cli( level, format, args ); mpw_vlog_cli( level, format, args );
va_end( args ); va_end( args );
} }