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

launcher: fix leak in launcher_weston_launch_connect()

Browse Source 
Leak found running drm-smoke-test with ASan.

Do not forget to free the launcher before returning when we can't open
the launcher fd. Also, just set 'out = launcher' after all error paths,
otherwise we give the caller a stale pointer.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro
2021-06-18 20:34:45 -03:00
committed by Daniel Stone
parent bd4f250d48
commit d42fa30d14
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/launcher-weston-launch.c
+7 -5
View File
@@ -323,12 +323,15 @@ launcher_weston_launch_connect(struct weston_launcher **out, struct weston_compo
return -ENOMEM; return -ENOMEM;
launcher->base.iface = &launcher_weston_launch_iface; launcher->base.iface = &launcher_weston_launch_iface;
* (struct launcher_weston_launch **) out = launcher;
launcher->compositor = compositor; launcher->compositor = compositor;
launcher->drm_fd = -1; launcher->drm_fd = -1;
launcher->deferred_deactivate = 0; launcher->deferred_deactivate = 0;
launcher->fd = launcher_weston_environment_get_fd("WESTON_LAUNCHER_SOCK"); launcher->fd = launcher_weston_environment_get_fd("WESTON_LAUNCHER_SOCK");
if (launcher->fd != -1) { if (launcher->fd == -1) {
free(launcher);
return -1;
}
launcher->tty = launcher_weston_environment_get_fd("WESTON_TTY_FD"); launcher->tty = launcher_weston_environment_get_fd("WESTON_TTY_FD");
/* We don't get a chance to read out the original kb /* We don't get a chance to read out the original kb
* mode for the tty, so just hard code K_UNICODE here * mode for the tty, so just hard code K_UNICODE here
@@ -346,10 +349,9 @@ launcher_weston_launch_connect(struct weston_launcher **out, struct weston_compo
return -ENOMEM; return -ENOMEM;
} }
* (struct launcher_weston_launch **) out = launcher;
return 0; return 0;
} else {
return -1;
}
} }
static void static void