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

Handle border-related malloc failures

Browse source
This commit is contained in:
Drew DeVault 2016-12-15 17:17:12 -05:00
parent ad7f68585b
commit 8691ff1b63
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/border.c
View file

@ -29,20 +29,24 @@ void border_clear(struct border *border) {
static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, cairo_surface_t **surface) { static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, cairo_surface_t **surface) {
if (view->border == NULL) { if (view->border == NULL) {
view->border = malloc(sizeof(struct border)); view->border = malloc(sizeof(struct border));
if (!view->border) {
sway_log(L_ERROR, "Unable to allocate window border information");
return NULL;
}
} }
cairo_t *cr; cairo_t *cr;
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, g.size.w); int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, g.size.w);
view->border->buffer = calloc(stride * g.size.h, sizeof(unsigned char)); view->border->buffer = calloc(stride * g.size.h, sizeof(unsigned char));
view->border->geometry = g; view->border->geometry = g;
if (!view->border->buffer) { if (!view->border->buffer) {
sway_log(L_DEBUG, "Unable to allocate buffer"); sway_log(L_ERROR, "Unable to allocate window border buffer");
return NULL; return NULL;
} }
*surface = cairo_image_surface_create_for_data(view->border->buffer, *surface = cairo_image_surface_create_for_data(view->border->buffer,
CAIRO_FORMAT_ARGB32, g.size.w, g.size.h, stride); CAIRO_FORMAT_ARGB32, g.size.w, g.size.h, stride);
if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) { if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) {
border_clear(view->border); border_clear(view->border);
sway_log(L_DEBUG, "Unable to allocate surface"); sway_log(L_ERROR, "Unable to allocate window border surface");
return NULL; return NULL;
} }
cr = cairo_create(*surface); cr = cairo_create(*surface);
@ -50,7 +54,7 @@ static cairo_t *create_border_buffer(swayc_t *view, struct wlc_geometry g, cairo
if (cairo_status(cr) != CAIRO_STATUS_SUCCESS) { if (cairo_status(cr) != CAIRO_STATUS_SUCCESS) {
cairo_surface_destroy(*surface); cairo_surface_destroy(*surface);
border_clear(view->border); border_clear(view->border);
sway_log(L_DEBUG, "Unable to create cairo context"); sway_log(L_ERROR, "Unable to create cairo context");
return NULL; return NULL;
} }
return cr; return cr;
@ -238,6 +242,10 @@ static char *generate_container_title(swayc_t *container) {
} }
int len = 9; int len = 9;
name = malloc(len * sizeof(char)); name = malloc(len * sizeof(char));
if (!name) {
sway_log(L_ERROR, "Unable to allocate container title");
return NULL;
}
snprintf(name, len, "sway: %c[", layout); snprintf(name, len, "sway: %c[", layout);
int i; int i;
@ -257,6 +265,11 @@ static char *generate_container_title(swayc_t *container) {
} }
name = malloc(len * sizeof(char)); name = malloc(len * sizeof(char));
if (!name) {
free(prev_name);
sway_log(L_ERROR, "Unable to allocate container title");
return NULL;
}
if (i < container->children->length-1) { if (i < container->children->length-1) {
snprintf(name, len, "%s%s ", prev_name, title); snprintf(name, len, "%s%s ", prev_name, title);
} else { } else {
@ -268,6 +281,11 @@ static char *generate_container_title(swayc_t *container) {
prev_name = name; prev_name = name;
len = strlen(name) + 2; len = strlen(name) + 2;
name = malloc(len * sizeof(char)); name = malloc(len * sizeof(char));
if (!name) {
free(prev_name);
sway_log(L_ERROR, "Unable to allocate container title");
return NULL;
}
snprintf(name, len, "%s]", prev_name); snprintf(name, len, "%s]", prev_name);
free(prev_name); free(prev_name);
free(container->name); free(container->name);
@ -347,6 +365,9 @@ static void update_view_border(swayc_t *view) {
} }
}; };
cr = create_border_buffer(view, g, &surface); cr = create_border_buffer(view, g, &surface);
if (!cr) {
goto cleanup;
}
bool render_top = !should_hide_top_border(view, view->y); bool render_top = !should_hide_top_border(view, view->y);
if (view == focused || is_child_of_focused) { if (view == focused || is_child_of_focused) {
@ -408,6 +429,8 @@ static void update_view_border(swayc_t *view) {
} }
} }
cleanup:
if (surface) { if (surface) {
cairo_surface_flush(surface); cairo_surface_flush(surface);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);