devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

message: fix possible segfault in _handle_conference

Browse Source
This commit is contained in:
Michael Vetter
2021-03-25 11:43:42 +01:00
parent f21a99eaf8
commit 96b228728e
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/xmpp/message.c
View File

@@ -931,29 +931,33 @@ _handle_conference(xmpp_stanza_t* const stanza)
{ {
xmpp_stanza_t* xns_conference = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CONFERENCE); xmpp_stanza_t* xns_conference = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CONFERENCE);
const char* from = xmpp_stanza_get_from(stanza); if (xns_conference) {
if (!from) {
log_warning("Message received with no from attribute, ignoring");
return;
}
Jid* jidp = jid_create(from); const char* from = xmpp_stanza_get_from(stanza);
if (!jidp) { if (!from) {
return; log_warning("Message received with no from attribute, ignoring");
} return;
}
// XEP-0249 Jid* jidp = jid_create(from);
const char* room = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_JID); if (!jidp) {
if (!room) { return;
}
// XEP-0249
const char* room = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_JID);
if (!room) {
jid_destroy(jidp);
return;
}
// reason and password are both optional
const char* reason = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_REASON);
const char* password = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_PASSWORD);
sv_ev_room_invite(INVITE_DIRECT, jidp->barejid, room, reason, password);
jid_destroy(jidp); jid_destroy(jidp);
return;
} }
const char* reason = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_REASON);
const char* password = xmpp_stanza_get_attribute(xns_conference, STANZA_ATTR_PASSWORD);
sv_ev_room_invite(INVITE_DIRECT, jidp->barejid, room, reason, password);
jid_destroy(jidp);
} }
static void static void