summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-04-11 21:08:44 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-04-11 21:08:44 -0400
commit9412dc7edf29073f069e48a266910ac3c4436170 (patch)
tree515f35605dc060fe8ce0ce4986b674acf4eef30e
parentMerge pull request #580 from mikkeloscar/handle-realloc-fail (diff)
parentPlug two memory leaks (diff)
downloadsway-0.4.tar.gz
sway-0.4.tar.zst
sway-0.4.zip
Merge pull request #582 from cl91/fix-memory-leaks0.4
Plug two memory leaks
-rw-r--r--sway/border.c2
-rw-r--r--sway/container.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/sway/border.c b/sway/border.c
index 6343ddd0..411c0427 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -86,6 +86,8 @@ int get_font_text_height(const char *font) {
86 cairo_t *cr = cairo_create(surface); 86 cairo_t *cr = cairo_create(surface);
87 int width, height; 87 int width, height;
88 get_text_size(cr, font, &width, &height, "Gg"); 88 get_text_size(cr, font, &width, &height, "Gg");
89 cairo_surface_destroy(surface);
90 cairo_destroy(cr);
89 return height; 91 return height;
90} 92}
91 93
diff --git a/sway/container.c b/sway/container.c
index 6dfc608d..a4b2d1c2 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -64,6 +64,7 @@ static void free_swayc(swayc_t *cont) {
64 if (cont->bg_pid != 0) { 64 if (cont->bg_pid != 0) {
65 terminate_swaybg(cont->bg_pid); 65 terminate_swaybg(cont->bg_pid);
66 } 66 }
67 free(cont->border);
67 free(cont); 68 free(cont);
68} 69}
69 70