blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix output destory: impl->destroy must be called last + obvious double-free

This commit is contained in:
Dominique Martinet 2017-08-14 14:59:48 +02:00
parent 9a9dd15d5f
commit db77530a35
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/wlr_output.c
View File

@ -178,13 +178,16 @@ void wlr_output_destroy(struct wlr_output *output) {
wlr_texture_destroy(output->cursor.texture); wlr_texture_destroy(output->cursor.texture);
wlr_renderer_destroy(output->cursor.renderer); wlr_renderer_destroy(output->cursor.renderer);
output->impl->destroy(output);
for (size_t i = 0; output->modes && i < output->modes->length; ++i) { for (size_t i = 0; output->modes && i < output->modes->length; ++i) {
struct wlr_output_mode *mode = output->modes->items[i]; struct wlr_output_mode *mode = output->modes->items[i];
free(mode); free(mode);
free(mode);
} }
list_free(output->modes); list_free(output->modes);
if (output->impl->destroy) {
output->impl->destroy(output);
} else {
free(output);
}
} }
void wlr_output_effective_resolution(struct wlr_output *output, void wlr_output_effective_resolution(struct wlr_output *output,