ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-04-10 01:07:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from gwenn/not_owned_interrupt_lock

Browse Source 
Prevent interrupt from non-owned connection
This commit is contained in:
gwenn 2024-07-23 19:46:43 +02:00 committed by GitHub
commit c67b7d6b20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/inner_connection.rs
View File

@ -46,7 +46,7 @@ impl InnerConnection {
pub unsafe fn new(db: *mut ffi::sqlite3, owned: bool) -> InnerConnection { pub unsafe fn new(db: *mut ffi::sqlite3, owned: bool) -> InnerConnection {
InnerConnection { InnerConnection {
db, db,
interrupt_lock: Arc::new(Mutex::new(db)), interrupt_lock: Arc::new(Mutex::new(if owned { db } else { ptr::null_mut() })),
#[cfg(feature = "hooks")] #[cfg(feature = "hooks")]
free_commit_hook: None, free_commit_hook: None,
#[cfg(feature = "hooks")] #[cfg(feature = "hooks")]
@ -155,7 +155,7 @@ impl InnerConnection {
self.remove_preupdate_hook(); self.remove_preupdate_hook();
let mut shared_handle = self.interrupt_lock.lock().unwrap(); let mut shared_handle = self.interrupt_lock.lock().unwrap();
assert!( assert!(
!shared_handle.is_null(), !self.owned || !shared_handle.is_null(),
"Bug: Somehow interrupt_lock was cleared before the DB was closed" "Bug: Somehow interrupt_lock was cleared before the DB was closed"
); );
if !self.owned { if !self.owned {