Merge pull request duckdb#8207 from krlmlr/b-copy-string

R: Avoid crash when finalizing
krlmlr · Aug 21, 2023 · 9c2d16f · 9c2d16f
1 parent 3447245
commit 9c2d16f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/rpkg/src/connection.cpp b/tools/rpkg/src/connection.cpp
@@ -3,7 +3,7 @@
 using namespace duckdb;
 
 void duckdb::ConnDeleter(ConnWrapper *conn) {
-	cpp11::warning("Connection is garbage-collected, use dbDisconnect() to avoid this.");
+	cpp11::warning(std::string("Connection is garbage-collected, use dbDisconnect() to avoid this."));
 	delete conn;
 }
 

diff --git a/tools/rpkg/src/database.cpp b/tools/rpkg/src/database.cpp
@@ -9,8 +9,8 @@
 using namespace duckdb;
 
 void duckdb::DBDeleter(DBWrapper *db) {
-	cpp11::warning("Database is garbage-collected, use dbDisconnect(con, shutdown=TRUE) or "
-	               "duckdb::duckdb_shutdown(drv) to avoid this.");
+	cpp11::warning(std::string("Database is garbage-collected, use dbDisconnect(con, shutdown=TRUE) or "
+	                           "duckdb::duckdb_shutdown(drv) to avoid this."));
 	delete db;
 }