alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix memleak in container_get_box

Browse source 
Rather than allocate a structure and expect callers to free it, take a
pointer to an existing struct as an argument.

This function is no longer called anywhere though.
This commit is contained in:
Ryan Dwyer 2018-06-27 17:47:41 +10:00
parent be86d3aba6
commit 8773ed3970
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/tree/container.h
View file

@ -295,6 +295,6 @@ bool container_is_floating(struct sway_container *container);
/** /**
* Get a container's box in layout coordinates. * Get a container's box in layout coordinates.
*/ */
struct wlr_box *container_get_box(struct sway_container *container); void container_get_box(struct sway_container *container, struct wlr_box *box);
#endif #endif

4
sway/tree/container.c
View file

@ -988,11 +988,9 @@ bool container_is_floating(struct sway_container *container) {
return container->parent == workspace->sway_workspace->floating; return container->parent == workspace->sway_workspace->floating;
} }
struct wlr_box *container_get_box(struct sway_container *container) { void container_get_box(struct sway_container *container, struct wlr_box *box) {
struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
box->x = container->x; box->x = container->x;
box->y = container->y; box->y = container->y;
box->width = container->width; box->width = container->width;
box->height = container->height; box->height = container->height;
return box;
} }