fix segfault on empty body

v1
Tony Olagbaiye 3 years ago
parent f6c67a1a33
commit 71531be5e6
No known key found for this signature in database
GPG Key ID: 9E2FF3BDEBDFC910

@ -83,10 +83,14 @@ int message_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
if (type != NULL && strcmp(type, "error") == 0) if (type != NULL && strcmp(type, "error") == 0)
return 1; return 1;
from = xmpp_stanza_get_from(stanza); from = xmpp_stanza_get_from(stanza);
if (from == NULL)
return 1;
from_bare = xmpp_jid_bare(account->context, from); from_bare = xmpp_jid_bare(account->context, from);
to = xmpp_stanza_get_to(stanza); to = xmpp_stanza_get_to(stanza);
intext = xmpp_stanza_get_text(body); intext = xmpp_stanza_get_text(body);
if (intext == NULL)
intext = strdup("");
struct t_channel *channel = channel__search(account, from_bare); struct t_channel *channel = channel__search(account, from_bare);
if (!channel) if (!channel)
@ -103,7 +107,7 @@ int message_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
if (strcmp(to, channel->id) == 0) if (strcmp(to, channel->id) == 0)
weechat_printf(channel->buffer, "%s [to %s]: %s", from, to, intext); weechat_printf(channel->buffer, "%s [to %s]: %s", from, to, intext);
else if (strncmp(intext, "/me ", 4) == 0) else if (weechat_string_match(intext, "/me *", 0))
weechat_printf(channel->buffer, "* %s %s", from, intext+4); weechat_printf(channel->buffer, "* %s %s", from, intext+4);
else else
weechat_printf(channel->buffer, "%s: %s", from, intext); weechat_printf(channel->buffer, "%s: %s", from, intext);

Loading…
Cancel
Save