MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 11:18:51 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Assert room_id in room_state_key creations.

Browse source 
ircd:Ⓜ️:room::messages: Assert room_id in ctor.
This commit is contained in:
Jason Volk 2019-08-16 02:05:34 -07:00
parent 34c1b13fa3
commit 6e8111f25f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ircd/m_dbs.cc
View file

@ -3068,6 +3068,7 @@ ircd::m::dbs::room_state_key(const mutable_buffer &out_,
{ {
mutable_buffer out{out_}; mutable_buffer out{out_};
consume(out, copy(out, room_id)); consume(out, copy(out, room_id));
assert(room_id);
if(likely(defined(type))) if(likely(defined(type)))
{ {

6
ircd/m_room.cc
View file

@ -1695,6 +1695,8 @@ ircd::m::room::messages::messages(const m::room &room,
event::fetch::default_opts event::fetch::default_opts
} }
{ {
assert(room.room_id);
if(room.event_id) if(room.event_id)
seek(room.event_id); seek(room.event_id);
else else
@ -1714,6 +1716,8 @@ ircd::m::room::messages::messages(const m::room &room,
event::fetch::default_opts event::fetch::default_opts
} }
{ {
assert(room.room_id);
seek(event_id); seek(event_id);
} }
@ -1730,6 +1734,8 @@ ircd::m::room::messages::messages(const m::room &room,
event::fetch::default_opts event::fetch::default_opts
} }
{ {
assert(room.room_id);
// As a special convenience for the ctor only, if the depth=0 and // As a special convenience for the ctor only, if the depth=0 and
// nothing is found another attempt is made for depth=1 for synapse // nothing is found another attempt is made for depth=1 for synapse
// rooms which start at depth=1. // rooms which start at depth=1.