Skip to content

fix(java/driver/jni): harden JNI exception helpers #4395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lidavidm wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −6
Open

fix(java/driver/jni): harden JNI exception helpers #4395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions java/driver/jni/src/main/cpp/jni_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,15 @@ struct AdbcErrorGuard {
void ThrowJavaException(JNIEnv* env, const std::string& klass,
const std::string& message) {
jclass exception_klass = env->FindClass(klass.c_str());
assert(exception_klass != nullptr);
if (exception_klass == nullptr) return;
jmethodID exception_ctor =
env->GetMethodID(exception_klass, "<init>", "(Ljava/lang/String)V");
assert(exception_ctor != nullptr);
env->GetMethodID(exception_klass, "<init>", "(Ljava/lang/String;)V");
if (exception_ctor == nullptr) return;
jstring message_jni = env->NewStringUTF(message.c_str());
if (message_jni == nullptr) return;
auto exc = static_cast<jthrowable>(
env->NewObject(exception_klass, exception_ctor, message_jni));
if (exc == nullptr) return;
env->Throw(exc);
}

Expand All @@ -73,16 +75,16 @@ struct AdbcException {

void ThrowJavaException(JNIEnv* env) const {
jclass exception_klass = env->FindClass("org/apache/arrow/adbc/core/AdbcException");
assert(exception_klass != nullptr);
if (exception_klass == nullptr) return;
jmethodID exception_ctor =
env->GetMethodID(exception_klass, "<init>",
"(Ljava/lang/String;Ljava/lang/Throwable;"
"Lorg/apache/arrow/adbc/core/AdbcStatusCode;"
"Ljava/lang/String;I)V");
assert(exception_ctor != nullptr);
if (exception_ctor == nullptr) return;

jclass status_klass = env->FindClass("org/apache/arrow/adbc/core/AdbcStatusCode");
assert(status_klass != nullptr);
if (status_klass == nullptr) return;

jfieldID status_field;

Expand Down Expand Up @@ -113,12 +115,15 @@ struct AdbcException {
break;
}
#undef CASE
if (status_field == nullptr) return;
jobject status_jni = env->GetStaticObjectField(status_klass, status_field);

jstring message_jni = env->NewStringUTF(message.c_str());
if (message_jni == nullptr) return;
auto exc = static_cast<jthrowable>(env->NewObject(
exception_klass, exception_ctor, message_jni, /*cause=*/nullptr, status_jni,
/*sqlState=*/nullptr, /*vendorCode=*/0));
if (exc == nullptr) return;
env->Throw(exc);
}
};
Expand Down
Loading