Minki/abaddon
1
0
Fork 0
mirror of https://github.com/uowuo/abaddon.git synced 2024-09-20 06:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix closing segfault

Browse Source
This commit is contained in:
ouwou 2023-10-01 02:49:10 -04:00
parent 5fa366c166
commit 6b08d7d12a
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/discord/store.cpp
View File

@ -27,18 +27,7 @@ Store::Store(bool mem_store)
m_ok &= CreateStatements();
}
Store::~Store() {
m_db.Close();
if (!m_db.OK()) {
fprintf(stderr, "error closing database: %s\n", m_db.ErrStr());
return;
}
if (m_db_path != ":memory:") {
std::error_code ec;
std::filesystem::remove(m_db_path, ec);
}
}
Store::~Store() {}
bool Store::IsValid() const {
return m_db.OK() && m_ok;
@ -2363,7 +2352,8 @@ bool Store::CreateStatements() {
return true;
}
Store::Database::Database(const char *path) {
Store::Database::Database(const char *path)
: m_db_path(path) {
if (path != ":memory:"s) {
std::error_code ec;
if (std::filesystem::exists(path, ec) && !std::filesystem::remove(path, ec)) {
@ -2380,9 +2370,18 @@ Store::Database::~Database() {
int Store::Database::Close() {
if (m_db == nullptr) return m_err;
m_signal_close.emit();
m_err = sqlite3_close(m_db);
m_db = nullptr;
if (!OK()) {
fprintf(stderr, "error closing database: %s\n", ErrStr());
} else {
if (m_db_path != ":memory:") {
std::error_code ec;
std::filesystem::remove(m_db_path, ec);
}
}
return m_err;
}
@ -2423,17 +2422,9 @@ sqlite3 *Store::Database::obj() {
return m_db;
}
Store::Database::type_signal_close Store::Database::signal_close() {
return m_signal_close;
}
Store::Statement::Statement(Database &db, const char *command)
: m_db(&db) {
if (m_db->SetError(sqlite3_prepare_v2(m_db->obj(), command, -1, &m_stmt, nullptr)) != SQLITE_OK) return;
m_db->signal_close().connect([this] {
sqlite3_finalize(m_stmt);
m_stmt = nullptr;
});
}
Store::Statement::~Statement() {

8
src/discord/store.hpp
View File

@ -121,13 +121,7 @@ private:
sqlite3 *m_db;
int m_err = SQLITE_OK;
mutable char m_err_scratch[256] { 0 };
// stupid shit i dont like to allow closing properly
using type_signal_close = sigc::signal<void>;
type_signal_close m_signal_close;
public:
type_signal_close signal_close();
std::filesystem::path m_db_path;
};
class Statement {