From e35dac3568627b90b84fe02c30c1ae8312b5dc6f Mon Sep 17 00:00:00 2001
From: Luis Nassif <lfcnassif@gmail.com>
Date: Wed, 5 Oct 2022 13:45:51 -0300
Subject: [PATCH] fixes #2723: use default JNI NewStringUTF(utf8) method as
 fallback

---
 bindings/java/jni/auto_db_java.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bindings/java/jni/auto_db_java.cpp b/bindings/java/jni/auto_db_java.cpp
index 033f28e07..e0e9afb5c 100644
--- a/bindings/java/jni/auto_db_java.cpp
+++ b/bindings/java/jni/auto_db_java.cpp
@@ -482,7 +482,9 @@ TSK_RETVAL_ENUM TskAutoDbJava::createJString(const char * input, jstring & newJS
 
     if (tsk_UTF8toUTF16((const UTF8 **)&source, (const UTF8 *)&source[input_len], &target, &target[input_len], TSKlenientConversion) != TSKconversionOK) {
         free(utf16_input);
-        return TSK_ERR;
+        // use default JNI method as fallback, fixes https://github.com/sleuthkit/sleuthkit/issues/2723
+        newJString = m_jniEnv->NewStringUTF(input);
+        return TSK_OK;
     }
 
     /*
-- 
GitLab