blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "render/drm: keep old drm_format if realloc fails" 

This reverts commit c1be9b6945.
This commit is contained in:
Drew DeVault 2019-08-12 19:53:39 +09:00
parent 82f48b8912
commit 540e23d102
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
render/drm_format_set.c
View File

@ -60,7 +60,7 @@ bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
struct wlr_drm_format **ptr = format_set_get_ref(set, format);
if (ptr) {
struct wlr_drm_format *fmt = *ptr, *newfmt = NULL;
struct wlr_drm_format *fmt = *ptr;
if (modifier == DRM_FORMAT_MOD_INVALID) {
return true;
@ -75,17 +75,17 @@ bool wlr_drm_format_set_add(struct wlr_drm_format_set *set, uint32_t format,
if (fmt->len == fmt->cap) {
size_t cap = fmt->cap ? fmt->cap * 2 : 4;
newfmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!newfmt) {
fmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return false;
}
newfmt->cap = cap;
*ptr = newfmt;
fmt->cap = cap;
*ptr = fmt;
}
newfmt->modifiers[newfmt->len++] = modifier;
fmt->modifiers[fmt->len++] = modifier;
return true;
}