aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge pull request #1045 from dbaer/master

Browse Source 
Fix use after free bug
This commit is contained in:
Michael Vetter 2019-03-22 14:49:59 +01:00 committed by GitHub
commit f7cb40ecf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/core.c
View File

@ -812,6 +812,7 @@ void
ui_room_destroy(const char *const roomjid) ui_room_destroy(const char *const roomjid)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
GList *privwins = wins_get_private_chats(roomjid);
if (window == NULL) { if (window == NULL) {
log_error("Received room destroy result, but no window open for %s.", roomjid); log_error("Received room destroy result, but no window open for %s.", roomjid);
} else { } else {
@ -820,7 +821,6 @@ ui_room_destroy(const char *const roomjid)
cons_show("Room destroyed: %s", roomjid); cons_show("Room destroyed: %s", roomjid);
} }
GList *privwins = wins_get_private_chats(roomjid);
GList *curr = privwins; GList *curr = privwins;
while (curr) { while (curr) {
ProfPrivateWin *privwin = curr->data; ProfPrivateWin *privwin = curr->data;
@ -834,12 +834,12 @@ void
ui_leave_room(const char *const roomjid) ui_leave_room(const char *const roomjid)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
GList *privwins = wins_get_private_chats(roomjid);
if (window) { if (window) {
int num = wins_get_num(window); int num = wins_get_num(window);
ui_close_win(num); ui_close_win(num);
} }
GList *privwins = wins_get_private_chats(roomjid);
GList *curr = privwins; GList *curr = privwins;
while (curr) { while (curr) {
ProfPrivateWin *privwin = curr->data; ProfPrivateWin *privwin = curr->data;
@ -855,6 +855,7 @@ ui_room_destroyed(const char *const roomjid, const char *const reason, const cha
const char *const password) const char *const password)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
GList *privwins = wins_get_private_chats(roomjid);
if (window == NULL) { if (window == NULL) {
log_error("Received room destroy, but no window open for %s.", roomjid); log_error("Received room destroy, but no window open for %s.", roomjid);
} else { } else {
@ -877,7 +878,6 @@ ui_room_destroyed(const char *const roomjid, const char *const reason, const cha
} }
} }
GList *privwins = wins_get_private_chats(roomjid);
GList *curr = privwins; GList *curr = privwins;
while (curr) { while (curr) {
ProfPrivateWin *privwin = curr->data; ProfPrivateWin *privwin = curr->data;
@ -891,6 +891,7 @@ void
ui_room_kicked(const char *const roomjid, const char *const actor, const char *const reason) ui_room_kicked(const char *const roomjid, const char *const actor, const char *const reason)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
GList *privwins = wins_get_private_chats(roomjid);
if (window == NULL) { if (window == NULL) {
log_error("Received kick, but no window open for %s.", roomjid); log_error("Received kick, but no window open for %s.", roomjid);
} else { } else {
@ -913,7 +914,6 @@ ui_room_kicked(const char *const roomjid, const char *const actor, const char *c
g_string_free(message, TRUE); g_string_free(message, TRUE);
} }
GList *privwins = wins_get_private_chats(roomjid);
GList *curr = privwins; GList *curr = privwins;
while (curr) { while (curr) {
ProfPrivateWin *privwin = curr->data; ProfPrivateWin *privwin = curr->data;
@ -927,6 +927,7 @@ void
ui_room_banned(const char *const roomjid, const char *const actor, const char *const reason) ui_room_banned(const char *const roomjid, const char *const actor, const char *const reason)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
GList *privwins = wins_get_private_chats(roomjid);
if (window == NULL) { if (window == NULL) {
log_error("Received ban, but no window open for %s.", roomjid); log_error("Received ban, but no window open for %s.", roomjid);
} else { } else {
@ -949,7 +950,6 @@ ui_room_banned(const char *const roomjid, const char *const actor, const char *c
g_string_free(message, TRUE); g_string_free(message, TRUE);
} }
GList *privwins = wins_get_private_chats(roomjid);
GList *curr = privwins; GList *curr = privwins;
while (curr) { while (curr) {
ProfPrivateWin *privwin = curr->data; ProfPrivateWin *privwin = curr->data;