mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/drm: keep old drm_format if realloc fails

Browse source
This commit is contained in:
Antonin Décimo 2019-08-09 14:59:42 +02:00 • committed by Drew DeVault
parent 52037d13f7
commit c1be9b6945
1 changed files with 6 additions and 6 deletions
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); struct wlr_drm_format **ptr = format_set_get_ref(set, format);
if (ptr) { if (ptr) {
struct wlr_drm_format *fmt = *ptr; struct wlr_drm_format *fmt = *ptr, *newfmt = NULL;
if (modifier == DRM_FORMAT_MOD_INVALID) { if (modifier == DRM_FORMAT_MOD_INVALID) {
return true; 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) { if (fmt->len == fmt->cap) {
size_t cap = fmt->cap ? fmt->cap * 2 : 4; size_t cap = fmt->cap ? fmt->cap * 2 : 4;
fmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap); newfmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap);
if (!fmt) { if (!newfmt) {
wlr_log_errno(WLR_ERROR, "Allocation failed"); wlr_log_errno(WLR_ERROR, "Allocation failed");
return false; return false;
} }
fmt->cap = cap; newfmt->cap = cap;
*ptr = fmt; *ptr = newfmt;
} }
fmt->modifiers[fmt->len++] = modifier; newfmt->modifiers[newfmt->len++] = modifier;
return true; return true;
} }