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

Merge pull request #926 from msantos/null-pointer-dereference

Browse Source 
server_events: fix potential NULL pointer deref
This commit is contained in:
Michael Vetter
2018-07-30 12:23:53 +02:00
committed by GitHub
parent 86a9ef7b5c db18ba8bdf
commit 811b3ba857
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/event/server_events.c
View File

@@ -896,8 +896,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);
@@ -914,11 +914,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);