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

server_events: fix potential NULL pointer deref

Browse Source
This commit is contained in:
Michael Santos 2017-04-12 10:20:22 -04:00
parent 2fafaec8a7
commit db18ba8bdf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/event/server_events.c
View File

@ -889,8 +889,8 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const
ProfMucWin *mucwin = wins_get_muc(room); ProfMucWin *mucwin = wins_get_muc(room);
if (mucwin) { if (mucwin) {
mucwin_occupant_nick_change(mucwin, old_nick, nick); mucwin_occupant_nick_change(mucwin, old_nick, nick);
wins_private_nick_change(mucwin->roomjid, old_nick, nick);
} }
wins_private_nick_change(mucwin->roomjid, old_nick, nick);
free(old_nick); free(old_nick);
occupantswin_occupants(room); occupantswin_occupants(room);
@ -907,11 +907,13 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const
} }
prefs_free_string(muc_status_pref); prefs_free_string(muc_status_pref);
Jid *jidp = jid_create_from_bare_and_resource(mucwin->roomjid, nick); if (mucwin) {
ProfPrivateWin *privwin = wins_get_private(jidp->fulljid); Jid *jidp = jid_create_from_bare_and_resource(mucwin->roomjid, nick);
jid_destroy(jidp); ProfPrivateWin *privwin = wins_get_private(jidp->fulljid);
if (privwin) { jid_destroy(jidp);
privwin_occupant_online(privwin); if (privwin) {
privwin_occupant_online(privwin);
}
} }
occupantswin_occupants(room); occupantswin_occupants(room);