Skip to content

GH-1205: Fix byte-array element leak in FromSchemaByteArray #1249

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
PG1204 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

GH-1205: Fix byte-array element leak in FromSchemaByteArray #1249

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
12 changes: 8 additions & 4 deletions dataset/src/main/cpp/jni_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,17 @@ arrow::Result<std::shared_ptr<arrow::Schema>> FromSchemaByteArray(
arrow::ipc::DictionaryMemo in_memo;
int schemaBytes_len = env->GetArrayLength(schemaBytes);
jbyte* schemaBytes_data = env->GetByteArrayElements(schemaBytes, nullptr);
// Ensure the pinned/copied Java array elements are always released, even when
// schema parsing fails and an error Result is returned early below.
auto release_elements = [&](jbyte* data) {
env->ReleaseByteArrayElements(schemaBytes, data, JNI_ABORT);
};
std::unique_ptr<jbyte, decltype(release_elements)> elements_guard(schemaBytes_data,
release_elements);
auto serialized_schema = std::make_shared<arrow::Buffer>(
reinterpret_cast<uint8_t*>(schemaBytes_data), schemaBytes_len);
arrow::io::BufferReader buf_reader(serialized_schema);
ARROW_ASSIGN_OR_RAISE(std::shared_ptr<arrow::Schema> schema,
arrow::ipc::ReadSchema(&buf_reader, &in_memo))
env->ReleaseByteArrayElements(schemaBytes, schemaBytes_data, JNI_ABORT);
return schema;
return arrow::ipc::ReadSchema(&buf_reader, &in_memo);
}
arrow::Status ExportRecordBatch(JNIEnv* env, const std::shared_ptr<RecordBatch>& batch,
jlong struct_array) {
Expand Down
Loading