Skip to content

Fix critical memory safety issue in Transaction API #49

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

Closed
wants to merge 2 commits into from
Closed

Fix critical memory safety issue in Transaction API #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e992ac
Fix critical memory safety issue in Transaction API
TonyMasson Jul 18, 2025
c7f578e
Remove unnecessary &mut from begin_transaction()
TonyMasson Jul 18, 2025
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: 9 additions & 8 deletions src/database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ impl Database {
/// it will be rolled back when dropped.
///
/// For simpler cases, consider using `in_transaction()` instead.
pub fn begin_transaction(&mut self) -> Result<Transaction> {
Transaction::new(self.get_ref())
pub fn begin_transaction(&self) -> Result<Transaction> {
Transaction::new(self)
}

/// Encrypts or decrypts a database, or changes its encryption key.
Expand Down Expand Up @@ -606,20 +606,21 @@ impl Database {
/// A database transaction that can be committed or rolled back.
/// When dropped without being committed, the transaction is automatically rolled back.
pub struct Transaction {
db_ref: *mut CBLDatabase,
db: Database,
committed: bool,
}

impl Transaction {
fn new(db_ref: *mut CBLDatabase) -> Result<Self> {
fn new(db: &Database) -> Result<Self> {
let db_clone = db.clone();
unsafe {
let mut err = CBLError::default();
if !CBLDatabase_BeginTransaction(db_ref, &mut err) {
if !CBLDatabase_BeginTransaction(db_clone.get_ref(), &mut err) {
return failure(err);
}
}
Ok(Transaction {
db_ref,
db: db_clone,
committed: false,
})
}
Expand All @@ -628,7 +629,7 @@ impl Transaction {
pub fn commit(mut self) -> Result<()> {
unsafe {
let mut err = CBLError::default();
if !CBLDatabase_EndTransaction(self.db_ref, true, &mut err) {
if !CBLDatabase_EndTransaction(self.db.get_ref(), true, &mut err) {
return failure(err);
}
}
Expand All @@ -642,7 +643,7 @@ impl Drop for Transaction {
if !self.committed {
unsafe {
let mut err = CBLError::default();
let _ = CBLDatabase_EndTransaction(self.db_ref, false, &mut err);
let _ = CBLDatabase_EndTransaction(self.db.get_ref(), false, &mut err);
}
}
}
Expand Down