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

Make muc_nick return a const char* const

Browse Source 
In the documentation of the `muc_nick` function we can read:

> The nickname is owned by the chat room and should not be modified or freed

We should reflect that in the return type and `strdup` the value for the
plugin API.

Fixes: https://github.com/profanity-im/profanity/issues/2013
This commit is contained in:
Hanspeter Portner
2025-01-19 13:21:31 +01:00
parent baddf2a8da
commit cb395b7c09
11 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/core.c
View File

@@ -778,7 +778,7 @@ ui_room_join(const char* const roomjid, gboolean focus)
}
ProfWin* window = (ProfWin*)mucwin;
char* nick = muc_nick(roomjid);
const char* const nick = muc_nick(roomjid);
win_print(window, THEME_ROOMINFO, "!", "-> You have joined the room as %s", nick);
if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) {
char* role = muc_role_str(roomjid);

6
src/ui/mucwin.c
View File

@@ -368,7 +368,7 @@ mucwin_history(ProfMucWin* mucwin, const ProfMessage* const message)
assert(mucwin != NULL);
char* nick = message->from_jid->resourcepart;
char* mynick = muc_nick(mucwin->roomjid);
const char* const mynick = muc_nick(mucwin->roomjid);
GSList* mentions = get_mentions(prefs_get_boolean(PREF_NOTIFY_MENTION_WHOLE_WORD), prefs_get_boolean(PREF_NOTIFY_MENTION_CASE_SENSITIVE), message->plain, mynick);
GList* triggers = prefs_message_get_triggers(message->plain);
@@ -512,7 +512,7 @@ mucwin_outgoing_msg(ProfMucWin* mucwin, const char* const message, const char* c
assert(mucwin != NULL);
ProfWin* window = (ProfWin*)mucwin;
char* mynick = muc_nick(mucwin->roomjid);
const char* const mynick = muc_nick(mucwin->roomjid);
// displayed message char
auto_char char* ch = get_enc_char(enc_mode, mucwin->message_char);
@@ -548,7 +548,7 @@ mucwin_incoming_msg(ProfMucWin* mucwin, const ProfMessage* const message, GSList
}
ProfWin* window = (ProfWin*)mucwin;
char* mynick = muc_nick(mucwin->roomjid);
const char* const mynick = muc_nick(mucwin->roomjid);
auto_char char* ch = get_enc_char(message->enc, mucwin->message_char);