From a98c1fbd9bd8601ef4aecb5edbb8af74a32067c2 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 13 Jul 2017 18:58:04 +0200 Subject: [PATCH] st/mesa: handle stfbi being NULL on entry of st_framebuffer_reuse_or_create Apparently this can happen. Just bail out early in that case, as all the called functions return NULL in that case. Fixes weston-terminal for me. Fixes: 147d7fb772a7 ("st/mesa: add a winsys buffers list in st_context") Signed-off-by: Lucas Stach Reviewed-by: Charmaine Lee --- src/mesa/state_tracker/st_manager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 348b456c4d1..d910eec00a1 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -788,6 +788,9 @@ st_framebuffer_reuse_or_create(struct st_context *st, { struct st_framebuffer *cur = NULL, *stfb = NULL; + if (!stfbi) + return NULL; + /* Check if there is already a framebuffer object for the specified * framebuffer interface in this context. If there is one, use it. */ -- 2.30.2