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

Merge pull request #1586 from profanity-im/mentions

Browse Source 
Fix invalid reads on mentions in MUC
This commit is contained in:
Michael Vetter 2021-07-17 20:20:00 +02:00 committed by GitHub
commit 1511e921d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/mucwin.c
View File

@ -386,12 +386,14 @@ _mucwin_print_mention(ProfWin* window, const char* const message, const char* co
int last_pos = 0; int last_pos = 0;
int pos; int pos;
GSList* curr = mentions; GSList* curr = mentions;
glong mynick_len = g_utf8_strlen(mynick, -1);
while (curr) { while (curr) {
pos = GPOINTER_TO_INT(curr->data); pos = GPOINTER_TO_INT(curr->data);
char *before_str = g_utf8_substring(message, last_pos, last_pos + pos - last_pos); char *before_str = g_utf8_substring(message, last_pos, pos);
if (strncmp(before_str, "/me ", 4) == 0) { if (last_pos == 0 && strncmp(before_str, "/me ", 4) == 0) {
win_print_them(window, THEME_ROOMMENTION, ch, flags, ""); win_print_them(window, THEME_ROOMMENTION, ch, flags, "");
win_append_highlight(window, THEME_ROOMMENTION, "*%s ", from); win_append_highlight(window, THEME_ROOMMENTION, "*%s ", from);
win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str + 4); win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str + 4);
@ -404,7 +406,6 @@ _mucwin_print_mention(ProfWin* window, const char* const message, const char* co
} }
g_free(before_str); g_free(before_str);
glong mynick_len = g_utf8_strlen(mynick, -1);
char* mynick_str = g_utf8_substring(message, pos, pos + mynick_len); char* mynick_str = g_utf8_substring(message, pos, pos + mynick_len);
win_append_highlight(window, THEME_ROOMMENTION_TERM, "%s", mynick_str); win_append_highlight(window, THEME_ROOMMENTION_TERM, "%s", mynick_str);
g_free(mynick_str); g_free(mynick_str);
@ -416,9 +417,9 @@ _mucwin_print_mention(ProfWin* window, const char* const message, const char* co
glong message_len = g_utf8_strlen(message, -1); glong message_len = g_utf8_strlen(message, -1);
if (last_pos < message_len) { if (last_pos < message_len) {
char* rest = g_utf8_substring(message, last_pos, last_pos + message_len); // get tail without allocating a new string
char* rest = g_utf8_offset_to_pointer(message, last_pos);
win_appendln_highlight(window, THEME_ROOMMENTION, "%s", rest); win_appendln_highlight(window, THEME_ROOMMENTION, "%s", rest);
g_free(rest);
} else { } else {
win_appendln_highlight(window, THEME_ROOMMENTION, ""); win_appendln_highlight(window, THEME_ROOMMENTION, "");
} }