From ac48724639e0a6a9e421b3b4e545d8506fd6bf5d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 2 Apr 2018 16:41:22 +0100 Subject: [PATCH] xwayland: zero num_formats from the start MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The caller may ignore the return value (will be addressed with later commit) so simply zero the count from the get-go. We're pretty much do so, in all cases but one :-\ Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers") Cc: Louis-Francis Ratté-Boulianne Cc: Daniel Stone Reviewed-by: Adam Jackson Signed-off-by: Emil Velikov --- hw/xwayland/xwayland-glamor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index 59461be1f..1b9a6b030 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -750,19 +750,18 @@ glamor_get_formats(ScreenPtr screen, struct xwl_screen *xwl_screen = xwl_screen_get(screen); int i; + /* Explicitly zero the count as the caller may ignore the return value */ + *num_formats = 0; + if (!xwl_screen->dmabuf_capable || !xwl_screen->dmabuf) return FALSE; - if (xwl_screen->num_formats == 0) { - *num_formats = 0; + if (xwl_screen->num_formats == 0) return TRUE; - } *formats = calloc(xwl_screen->num_formats, sizeof(CARD32)); - if (*formats == NULL) { - *num_formats = 0; + if (*formats == NULL) return FALSE; - } for (i = 0; i < xwl_screen->num_formats; i++) (*formats)[i] = xwl_screen->formats[i].format;