From 109f9f39106de13880381aae020add77a54823f7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 26 Jan 2021 14:17:52 -0500 Subject: [PATCH] vl: Silence a warning at -Og MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ../src/gallium/auxiliary/vl/vl_winsys_dri.c: In function ‘vl_dri2_screen_texture_from_drawable’: ../src/gallium/auxiliary/vl/vl_winsys_dri.c:239:34: warning: ‘back_left’ may be used uninitialized in this function [-Wmaybe-uninitialized] 239 | dri2_handle.stride = back_left->pitch; The server would be broken if it failed to inform us of the back left buffer, but let's leave nothing to chance. Reviewed-by: Eric Anholt Part-of: --- src/gallium/auxiliary/vl/vl_winsys_dri.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index 1f160ec..091395d 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -186,7 +186,7 @@ vl_dri2_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable) struct pipe_resource templ, *tex; xcb_dri2_get_buffers_reply_t *reply; - xcb_dri2_dri2_buffer_t *buffers, *back_left; + xcb_dri2_dri2_buffer_t *buffers, *back_left = NULL; unsigned depth = ((xcb_screen_t *)(vscreen->xcb_screen))->root_depth; unsigned i; @@ -217,7 +217,7 @@ vl_dri2_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable) } } - if (i == reply->count) { + if (i == reply->count || !back_left) { free(reply); return NULL; } -- 2.7.4