From 71a069fd7fbe815d386fc1b3c44cda732cff7af0 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 2 Apr 2018 16:41:23 +0100 Subject: glamor: 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 --- glamor/glamor_egl.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'glamor') diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 7050bd001..9edb50967 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -596,30 +596,26 @@ glamor_get_formats(ScreenPtr screen, struct glamor_egl_screen_private *glamor_egl; EGLint num; + /* Explicitly zero the count as the caller may ignore the return value */ + *num_formats = 0; + glamor_egl = glamor_egl_get_screen_private(xf86ScreenToScrn(screen)); if (!glamor_egl->dmabuf_capable) return FALSE; - if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, 0, NULL, &num)) { - *num_formats = 0; + if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, 0, NULL, &num)) return FALSE; - } - if (num == 0) { - *num_formats = 0; + if (num == 0) return TRUE; - } *formats = calloc(num, sizeof(CARD32)); - if (*formats == NULL) { - *num_formats = 0; + if (*formats == NULL) return FALSE; - } if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, num, (EGLint *) *formats, &num)) { - *num_formats = 0; free(*formats); return FALSE; } -- cgit v1.2.3