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

compositor-drm: Catch errors in create_output_for_connector

Browse Source 
We do not handle errors of gbm-buffer-creation and drm-mode-setting in
create_output_for_connectors. Correctly catch these now and free memory on error
to avoid memory leaks.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann
2011-12-08 17:05:46 +01:00
committed by Kristian Høgsberg
parent 0f0d54e5c5
commit d7c4551562
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-drm.c
+26 -3
View File
@@ -454,6 +454,8 @@ create_output_for_connector(struct drm_compositor *ec,
drmModeFreeEncoder(encoder); drmModeFreeEncoder(encoder);
return -1; return -1;
} }
output->fb_id[0] = -1;
output->fb_id[1] = -1;
memset(output, 0, sizeof *output); memset(output, 0, sizeof *output);
output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel); output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel);
@@ -498,11 +500,15 @@ create_output_for_connector(struct drm_compositor *ec,
GBM_BO_FORMAT_XRGB8888, GBM_BO_FORMAT_XRGB8888,
GBM_BO_USE_SCANOUT | GBM_BO_USE_SCANOUT |
GBM_BO_USE_RENDERING); GBM_BO_USE_RENDERING);
if (!output->bo[i])
goto err_bufs;
output->image[i] = ec->base.create_image(ec->base.display, output->image[i] = ec->base.create_image(ec->base.display,
NULL, NULL,
EGL_NATIVE_PIXMAP_KHR, EGL_NATIVE_PIXMAP_KHR,
output->bo[i], NULL); output->bo[i], NULL);
if (!output->image[i])
goto err_bufs;
ec->base.image_target_renderbuffer_storage(GL_RENDERBUFFER, ec->base.image_target_renderbuffer_storage(GL_RENDERBUFFER,
output->image[i]); output->image[i]);
@@ -515,7 +521,7 @@ create_output_for_connector(struct drm_compositor *ec,
24, 32, stride, handle, &output->fb_id[i]); 24, 32, stride, handle, &output->fb_id[i]);
if (ret) { if (ret) {
fprintf(stderr, "failed to add fb %d: %m\n", i); fprintf(stderr, "failed to add fb %d: %m\n", i);
return -1; goto err_bufs;
} }
} }
@@ -530,7 +536,7 @@ create_output_for_connector(struct drm_compositor *ec,
&drm_mode->mode_info); &drm_mode->mode_info);
if (ret) { if (ret) {
fprintf(stderr, "failed to set mode: %m\n"); fprintf(stderr, "failed to set mode: %m\n");
return -1; goto err_fb;
} }
wlsc_output_init(&output->base, &ec->base, x, y, wlsc_output_init(&output->base, &ec->base, x, y,
@@ -548,6 +554,23 @@ create_output_for_connector(struct drm_compositor *ec,
return 0; return 0;
err_fb:
glFramebufferRenderbuffer(GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
GL_RENDERBUFFER,
0);
err_bufs:
for (i = 0; i < 2; i++) {
if (output->fb_id[i] != -1)
drmModeRmFB(ec->drm.fd, output->fb_id[i]);
if (output->image[i])
ec->base.destroy_image(ec->base.display,
output->image[i]);
if (output->bo[i])
gbm_bo_destroy(output->bo[i]);
}
glBindRenderbuffer(GL_RENDERBUFFER, 0);
glDeleteRenderbuffers(2, output->rbo);
err_free: err_free:
wl_list_for_each_safe(drm_mode, next, &output->base.mode_list, wl_list_for_each_safe(drm_mode, next, &output->base.mode_list,
base.link) { base.link) {