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

Use catch_unwind in init_auto_extension (#1489)

Browse Source 
Use catch_unwind in init_auto_extension
This commit is contained in:
gwenn 2024-03-31 13:22:00 +02:00 committed by GitHub
parent d8bcd4d28a
commit a0b410eb86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/auto_extension.rs
View File

@ -1,8 +1,9 @@
//! Automatic axtension loading //! Automatic axtension loading
use super::ffi; use super::ffi;
use crate::error::{check, to_sqlite_error}; use crate::error::{check, to_sqlite_error};
use crate::{Connection, Result}; use crate::{Connection, Error, Result};
use std::os::raw::{c_char, c_int}; use std::os::raw::{c_char, c_int};
use std::panic::catch_unwind;
/// Automatic extension initialization routine /// Automatic extension initialization routine
pub type AutoExtension = fn(Connection) -> Result<()>; pub type AutoExtension = fn(Connection) -> Result<()>;
@ -27,8 +28,12 @@ pub unsafe fn init_auto_extension(
pz_err_msg: *mut *mut c_char, pz_err_msg: *mut *mut c_char,
ax: AutoExtension, ax: AutoExtension,
) -> c_int { ) -> c_int {
let c = Connection::from_handle(db); let r = catch_unwind(|| {
match c.and_then(ax) { let c = Connection::from_handle(db);
c.and_then(ax)
})
.unwrap_or_else(|_| Err(Error::UnwindingPanic));
match r {
Err(e) => to_sqlite_error(&e, pz_err_msg), Err(e) => to_sqlite_error(&e, pz_err_msg),
_ => ffi::SQLITE_OK, _ => ffi::SQLITE_OK,
} }

5
src/error.rs
View File

@ -102,8 +102,6 @@ pub enum Error {
ModuleError(String), ModuleError(String),
/// An unwinding panic occurs in an UDF (user-defined function). /// An unwinding panic occurs in an UDF (user-defined function).
#[cfg(feature = "functions")]
#[cfg_attr(docsrs, doc(cfg(feature = "functions")))]
UnwindingPanic, UnwindingPanic,
/// An error returned when /// An error returned when
@ -185,7 +183,6 @@ impl PartialEq for Error {
(Error::InvalidQuery, Error::InvalidQuery) => true, (Error::InvalidQuery, Error::InvalidQuery) => true,
#[cfg(feature = "vtab")] #[cfg(feature = "vtab")]
(Error::ModuleError(s1), Error::ModuleError(s2)) => s1 == s2, (Error::ModuleError(s1), Error::ModuleError(s2)) => s1 == s2,
#[cfg(feature = "functions")]
(Error::UnwindingPanic, Error::UnwindingPanic) => true, (Error::UnwindingPanic, Error::UnwindingPanic) => true,
#[cfg(feature = "functions")] #[cfg(feature = "functions")]
(Error::GetAuxWrongType, Error::GetAuxWrongType) => true, (Error::GetAuxWrongType, Error::GetAuxWrongType) => true,
@ -318,7 +315,6 @@ impl fmt::Display for Error {
Error::InvalidQuery => write!(f, "Query is not read-only"), Error::InvalidQuery => write!(f, "Query is not read-only"),
#[cfg(feature = "vtab")] #[cfg(feature = "vtab")]
Error::ModuleError(ref desc) => write!(f, "{desc}"), Error::ModuleError(ref desc) => write!(f, "{desc}"),
#[cfg(feature = "functions")]
Error::UnwindingPanic => write!(f, "unwinding panic"), Error::UnwindingPanic => write!(f, "unwinding panic"),
#[cfg(feature = "functions")] #[cfg(feature = "functions")]
Error::GetAuxWrongType => write!(f, "get_aux called with wrong type"), Error::GetAuxWrongType => write!(f, "get_aux called with wrong type"),
@ -375,7 +371,6 @@ impl error::Error for Error {
#[cfg(feature = "vtab")] #[cfg(feature = "vtab")]
Error::ModuleError(_) => None, Error::ModuleError(_) => None,
#[cfg(feature = "functions")]
Error::UnwindingPanic => None, Error::UnwindingPanic => None,
#[cfg(feature = "functions")] #[cfg(feature = "functions")]