mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-terminal: Fix some egregious memory leaks

Browse Source 
Some of the Pango bits still leak, but this takes care of a lot of the
worst.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2022-06-24 11:41:33 +01:00
parent 6bfbfb2e10
commit f9e54ab2f8
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/terminal.c
+12 -2
View File
@@ -3023,13 +3023,19 @@ static void
terminal_destroy(struct terminal *terminal) terminal_destroy(struct terminal *terminal)
{ {
display_unwatch_fd(terminal->display, terminal->master); display_unwatch_fd(terminal->display, terminal->master);
window_destroy(terminal->window);
close(terminal->master); close(terminal->master);
widget_destroy(terminal->widget);
window_destroy(terminal->window);
wl_list_remove(&terminal->link); wl_list_remove(&terminal->link);
if (wl_list_empty(&terminal_list)) if (wl_list_empty(&terminal_list))
display_exit(terminal->display); display_exit(terminal->display);
free(terminal->data);
free(terminal->data_attr);
free(terminal->tab_ruler);
free(terminal->title); free(terminal->title);
free(terminal); free(terminal);
} }
@@ -3128,7 +3134,7 @@ static const struct weston_option terminal_options[] = {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct display *d; struct display *d;
struct terminal *terminal; struct terminal *terminal, *tmp;
const char *config_file; const char *config_file;
struct sigaction sigpipe; struct sigaction sigpipe;
struct weston_config *config; struct weston_config *config;
@@ -3183,5 +3189,9 @@ int main(int argc, char *argv[])
display_run(d); display_run(d);
wl_list_for_each_safe(terminal, tmp, &terminal_list, link)
terminal_destroy(terminal);
display_destroy(d);
return 0; return 0;
} }