Skip to content
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

Jump to bottom

fix(r/adbcdrivermanager): Ensure that class of object is checked before calling R_ExternalPtrAddrFn #1989

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix(r/adbcdrivermanager): Ensure that class of object is checked before calling R_ExternalPtrAddrFn #1989

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
10 changes: 6 additions & 4 deletions r/adbcdrivermanager/src/radbc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,13 @@ extern "C" SEXP RAdbcLoadDriver(SEXP driver_name_sexp, SEXP entrypoint_sexp) {
}

extern "C" SEXP RAdbcLoadDriverFromInitFunc(SEXP driver_init_func_xptr) {
auto driver_init_func =
reinterpret_cast<AdbcDriverInitFunc>(R_ExternalPtrAddrFn(driver_init_func_xptr));
if (!Rf_inherits(driver_init_func_xptr, "adbc_driver_init_func")) {
Rf_error("Expected external pointer with class '%s'", "adbc_driver_init_func");
}

auto driver_init_func =
reinterpret_cast<AdbcDriverInitFunc>(R_ExternalPtrAddrFn(driver_init_func_xptr));

SEXP driver_xptr = PROTECT(adbc_allocate_xptr<AdbcDriver>());
R_RegisterCFinalizer(driver_xptr, &finalize_driver_xptr);
auto driver = adbc_from_xptr<AdbcDriver>(driver_xptr);
Expand Down Expand Up @@ -148,12 +149,13 @@ extern "C" SEXP RAdbcDatabaseNew(SEXP driver_init_func_xptr) {
adbc_error_stop(status, &error);

if (driver_init_func_xptr != R_NilValue) {
auto driver_init_func =
reinterpret_cast<AdbcDriverInitFunc>(R_ExternalPtrAddrFn(driver_init_func_xptr));
if (!Rf_inherits(driver_init_func_xptr, "adbc_driver_init_func")) {
Rf_error("Expected external pointer with class '%s'", "adbc_driver_init_func");
}

auto driver_init_func =
reinterpret_cast<AdbcDriverInitFunc>(R_ExternalPtrAddrFn(driver_init_func_xptr));

status = AdbcDriverManagerDatabaseSetInitFunc(database, driver_init_func, &error);
adbc_error_stop(status, &error);
}
Expand Down
Loading