aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

mesage: make _handle_ox_chat safer

Browse Source 
And on the way fix a memleak
This commit is contained in:
Michael Vetter 2021-03-25 15:20:53 +01:00
parent 8a6d256fc1
commit 11382a8bf3
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xmpp/message.c
View File

@ -1425,12 +1425,26 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
message->enc = PROF_MSG_ENC_OX;
#ifdef HAVE_LIBGPGME
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox));
xmpp_ctx_t* const ctx = connection_get_ctx();
xmpp_stanza_t *x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain);
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
if (!ox) {
return;
}
char* ox_text = xmpp_stanza_get_text(ox);
if (!ox_text) {
return;
}
message->plain = p_ox_gpg_decrypt(ox_text);
xmpp_free(ctx, ox_text);
xmpp_stanza_t *x = xmpp_stanza_new_from_string(ctx, message->plain);
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload");
if (p) {
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body");
if (b) {
message->plain = xmpp_stanza_get_text(b);
if(message->plain == NULL ) {
message->plain = xmpp_stanza_get_text(stanza);
@ -1441,6 +1455,8 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
message->plain = xmpp_stanza_get_text(stanza);
}
message->encrypted = xmpp_stanza_get_text(ox);
}
}
#endif // HAVE_LIBGPGME
}