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

Fix use-after-free with block hotspots

Browse source
This commit is contained in:
Drew DeVault 2018-04-02 11:53:56 -04:00
parent 0cbd2a4f49
commit c507727ad2
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/pango.c
View file

@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "log.h"
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
const char *text, int32_t scale, bool markup) { const char *text, int32_t scale, bool markup) {
@ -13,7 +14,13 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
PangoAttrList *attrs; PangoAttrList *attrs;
if (markup) { if (markup) {
char *buf; char *buf;
pango_parse_markup(text, -1, 0, &attrs, &buf, NULL, NULL); GError *error = NULL;
if (!sway_assert(pango_parse_markup(
text, -1, 0, &attrs, &buf, NULL, &error),
"pango_parse_markup '%s' -> error %s", text,
error ? error->message : NULL)) {
return NULL;
}
pango_layout_set_markup(layout, buf, -1); pango_layout_set_markup(layout, buf, -1);
free(buf); free(buf);
} else { } else {

4
sway/tree/layout.c
View file

@ -248,8 +248,8 @@ void arrange_windows(struct sway_container *container,
struct wlr_box *area = &output->sway_output->usable_area; struct wlr_box *area = &output->sway_output->usable_area;
wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d", wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
area->width, area->height, area->x, area->y); area->width, area->height, area->x, area->y);
container->width = area->width; container->width = width = area->width;
container->height = area->height; container->height = height = area->height;
container->x = x = area->x; container->x = x = area->x;
container->y = y = area->y; container->y = y = area->y;
wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",

4
swaybar/i3bar.c
View file

@ -30,9 +30,7 @@ static bool i3bar_parse_json(struct status_line *status, const char *text) {
status_error(status, "[failed to parse i3bar json]"); status_error(status, "[failed to parse i3bar json]");
return false; return false;
} }
if (json_object_array_length(results) < 1) { wlr_log(L_DEBUG, "Got i3bar json: '%s'", text);
return true;
}
for (size_t i = 0; i < json_object_array_length(results); ++i) { for (size_t i = 0; i < json_object_array_length(results); ++i) {
json_object *full_text, *short_text, *color, *min_width, *align, *urgent; json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
json_object *name, *instance, *separator, *separator_block_width; json_object *name, *instance, *separator, *separator_block_width;

5
swaybar/render.c
View file

@ -153,7 +153,7 @@ static uint32_t render_status_block(cairo_t *cairo,
hotspot->width = width; hotspot->width = width;
hotspot->height = height; hotspot->height = height;
hotspot->callback = block_hotspot_callback; hotspot->callback = block_hotspot_callback;
hotspot->destroy = free; hotspot->destroy = NULL;
hotspot->data = block; hotspot->data = block;
wl_list_insert(&output->hotspots, &hotspot->link); wl_list_insert(&output->hotspots, &hotspot->link);
@ -227,9 +227,9 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
struct swaybar_config *config, struct swaybar_output *output, struct swaybar_config *config, struct swaybar_output *output,
struct status_line *status, bool focused, struct status_line *status, bool focused,
double *x, uint32_t width, uint32_t height) { double *x, uint32_t width, uint32_t height) {
struct i3bar_block *block;
uint32_t max_height = 0; uint32_t max_height = 0;
bool edge = true; bool edge = true;
struct i3bar_block *block;
wl_list_for_each_reverse(block, &status->blocks, link) { wl_list_for_each_reverse(block, &status->blocks, link) {
uint32_t h = render_status_block(cairo, config, output, uint32_t h = render_status_block(cairo, config, output,
block, x, height, focused, edge); block, x, height, focused, edge);
@ -376,6 +376,7 @@ static uint32_t render_workspace_button(cairo_t *cairo,
static uint32_t render_to_cairo(cairo_t *cairo, static uint32_t render_to_cairo(cairo_t *cairo,
struct swaybar *bar, struct swaybar_output *output) { struct swaybar *bar, struct swaybar_output *output) {
struct swaybar_config *config = bar->config; struct swaybar_config *config = bar->config;
wlr_log(L_DEBUG, "output %p", output);
cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
if (output->focused) { if (output->focused) {