xrender: fix leak in deinit

and check should we actually free something fixes at least #960
yshui · Dec 21, 2022 · dd9ffec · dd9ffec
1 parent 48d3a0b
commit dd9ffec
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/backend/xrender/xrender.c b/src/backend/xrender/xrender.c
@@ -576,9 +576,13 @@ static void deinit(backend_t *backend_data) {
 		xcb_render_free_picture(xd->base.c, xd->alpha_pict[i]);
 	}
 	xcb_render_free_picture(xd->base.c, xd->target);
-	for (int i = 0; i < 2; i++) {
-		xcb_render_free_picture(xd->base.c, xd->back[i]);
-		xcb_free_pixmap(xd->base.c, xd->back_pixmap[i]);
+	for (int i = 0; i < 3; i++) {
+		if (xd->back[i] != XCB_NONE) {
+			xcb_render_free_picture(xd->base.c, xd->back[i]);
+		}
+		if (xd->back_pixmap[i] != XCB_NONE) {
+			xcb_free_pixmap(xd->base.c, xd->back_pixmap[i]);
+		}
 	}
 	if (xd->present_event) {
 		xcb_unregister_for_special_event(xd->base.c, xd->present_event);