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

compositor: Fix possible memory leak when wl_display_create() fails

Browse Source 
The buffer created for flight recorder, the allocations done in 'logger' and
'flight_rec' subscribers were not freed when wl_display_create() fails. So
move them to out_display

Signed-off-by: Anurup M <anurup.mokkil@gmail.com>
This commit is contained in:
Anurup M
2020-11-19 16:54:11 +05:30
committed by Anurup M
parent 09a7dfb12c
commit 6aa46844a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+5 -5
View File
@@ -3423,11 +3423,6 @@ out:
weston_compositor_destroy(wet.compositor); weston_compositor_destroy(wet.compositor);
weston_log_scope_destroy(protocol_scope); weston_log_scope_destroy(protocol_scope);
protocol_scope = NULL; protocol_scope = NULL;
weston_log_scope_destroy(log_scope);
log_scope = NULL;
weston_log_subscriber_destroy(logger);
weston_log_subscriber_destroy(flight_rec);
weston_log_ctx_destroy(log_ctx);
out_signals: out_signals:
for (i = ARRAY_LENGTH(signals) - 1; i >= 0; i--) for (i = ARRAY_LENGTH(signals) - 1; i >= 0; i--)
@@ -3437,6 +3432,11 @@ out_signals:
wl_display_destroy(display); wl_display_destroy(display);
out_display: out_display:
weston_log_scope_destroy(log_scope);
log_scope = NULL;
weston_log_subscriber_destroy(logger);
weston_log_subscriber_destroy(flight_rec);
weston_log_ctx_destroy(log_ctx);
weston_log_file_close(); weston_log_file_close();
if (config) if (config)