rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix potential crash when trying to read room info too early

Browse Source
This commit is contained in:
Nicolas Werner 2021-08-11 00:21:02 +02:00
parent 6e8adc7320
commit dbea031a86
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cache.cpp
View File

@ -1587,6 +1587,8 @@ RoomInfo
Cache::singleRoomInfo(const std::string &room_id) Cache::singleRoomInfo(const std::string &room_id)
{ {
auto txn = ro_txn(env_); auto txn = ro_txn(env_);
try {
auto statesdb = getStatesDb(txn, room_id); auto statesdb = getStatesDb(txn, room_id);
std::string_view data; std::string_view data;
@ -1607,6 +1609,10 @@ Cache::singleRoomInfo(const std::string &room_id)
e.what()); e.what());
} }
} }
} catch (const lmdb::error &e) {
nhlog::db()->warn(
"failed to read room info from db: room_id ({}), {}", room_id, e.what());
}
return RoomInfo(); return RoomInfo();
} }