aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Exit *_incoming_msg functions when plain message is empty

Browse Source 
Fix https://github.com/profanity-im/profanity/issues/1733
This commit is contained in:
Michael Vetter 2022-07-04 16:45:18 +02:00
parent f30999fd51
commit c8b2979dcd
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/chatwin.c
View File

@ -310,6 +310,12 @@ void
chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_created) chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_created)
{ {
assert(chatwin != NULL); assert(chatwin != NULL);
if (message->plain == NULL) {
log_error("chatwin_incoming_msg: Message with no plain field from: %s", message->from_jid);
return;
}
char* old_plain = message->plain; char* old_plain = message->plain;
message->plain = plugins_pre_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain); message->plain = plugins_pre_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain);

5
src/ui/mucwin.c
View File

@ -551,6 +551,11 @@ mucwin_incoming_msg(ProfMucWin* mucwin, const ProfMessage* const message, GSList
assert(mucwin != NULL); assert(mucwin != NULL);
int flags = 0; int flags = 0;
if (message->plain == NULL) {
log_error("mucwin_incoming_msg: Message with no plain field from: %s", message->from_jid);
return;
}
if (filter_reflection && message_is_sent_by_us(message, TRUE)) { if (filter_reflection && message_is_sent_by_us(message, TRUE)) {
/* Ignore reflection messages */ /* Ignore reflection messages */
return; return;

6
src/ui/privwin.c
View File

@ -39,6 +39,7 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include "log.h"
#include "config/preferences.h" #include "config/preferences.h"
#include "ui/win_types.h" #include "ui/win_types.h"
#include "ui/window.h" #include "ui/window.h"
@ -50,6 +51,11 @@ privwin_incoming_msg(ProfPrivateWin* privatewin, ProfMessage* message)
{ {
assert(privatewin != NULL); assert(privatewin != NULL);
if (message->plain == NULL) {
log_error("privwin_incoming_msg: Message with no plain field from: %s", message->from_jid);
return;
}
ProfWin* window = (ProfWin*)privatewin; ProfWin* window = (ProfWin*)privatewin;
int num = wins_get_num(window); int num = wins_get_num(window);