d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few db access crashes

Browse source
This commit is contained in:
Nicolas Werner 2021-03-12 17:13:56 +01:00
parent 2a70847c80
commit 6ad4065de4
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Cache.cpp
View file

@ -787,6 +787,9 @@ Cache::isInitialized()
std::string std::string
Cache::nextBatchToken() Cache::nextBatchToken()
{ {
if (!env_.handle())
throw lmdb::error("Env already closed", MDB_INVALID);
auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
std::string_view token; std::string_view token;
@ -1816,6 +1819,9 @@ Cache::getTimelineRange(const std::string &room_id)
std::optional<uint64_t> std::optional<uint64_t>
Cache::getTimelineIndex(const std::string &room_id, std::string_view event_id) Cache::getTimelineIndex(const std::string &room_id, std::string_view event_id)
{ {
if (event_id.empty() || room_id.empty())
return {};
auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
lmdb::dbi orderDb; lmdb::dbi orderDb;

13
src/ChatPage.cpp
View file

@ -873,11 +873,14 @@ ChatPage::trySync()
http::client()->sync( http::client()->sync(
opts, opts,
[this, since = cache::nextBatchToken()](const mtx::responses::Sync &res, [this, since = opts.since](const mtx::responses::Sync &res, mtx::http::RequestErr err) {
mtx::http::RequestErr err) { try {
if (since != cache::nextBatchToken()) { if (since != cache::nextBatchToken()) {
nhlog::net()->warn("Duplicate sync, dropping"); nhlog::net()->warn("Duplicate sync, dropping");
return; return;
}
} catch (const lmdb::error &e) {
nhlog::db()->warn("Logged out in the mean time, dropping sync");
} }
if (err) { if (err) {