From c1be9b6945f9c664fe694a09620758db9ca695e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Fri, 9 Aug 2019 14:59:42 +0200 Subject: [PATCH] render/drm: keep old drm_format if realloc fails --- render/drm_format_set.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/render/drm_format_set.c b/render/drm_format_set.c index b09a68a42..297c2ab1a 100644 --- a/render/drm_format_set.c +++ b/render/drm_format_set.c @@ -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; + struct wlr_drm_format *fmt = *ptr, *newfmt = NULL; 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; - fmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap); - if (!fmt) { + newfmt = realloc(fmt, sizeof(*fmt) + sizeof(fmt->modifiers[0]) * cap); + if (!newfmt) { wlr_log_errno(WLR_ERROR, "Allocation failed"); return false; } - fmt->cap = cap; - *ptr = fmt; + newfmt->cap = cap; + *ptr = newfmt; } - fmt->modifiers[fmt->len++] = modifier; + newfmt->modifiers[newfmt->len++] = modifier; return true; }