From a543f231d712dbdfd309ff589766179c5cb32b20 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Mon, 26 Sep 2016 23:22:31 +0100 Subject: [PATCH] st/va: Fix vaSyncSurface with no outstanding operation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes crash if the application doesn't do what the state tracker expects. Reviewed-by: Christian König --- src/gallium/state_trackers/va/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c index 115db43f791..173e7d91ac6 100644 --- a/src/gallium/state_trackers/va/surface.c +++ b/src/gallium/state_trackers/va/surface.c @@ -111,6 +111,12 @@ vlVaSyncSurface(VADriverContextP ctx, VASurfaceID render_target) return VA_STATUS_ERROR_INVALID_SURFACE; } + if (!surf->feedback) { + // No outstanding operation: nothing to do. + pipe_mutex_unlock(drv->mutex); + return VA_STATUS_SUCCESS; + } + context = handle_table_get(drv->htab, surf->ctx); if (!context) { pipe_mutex_unlock(drv->mutex); @@ -126,6 +132,7 @@ vlVaSyncSurface(VADriverContextP ctx, VASurfaceID render_target) if (frame_diff < 2) context->decoder->flush(context->decoder); context->decoder->get_feedback(context->decoder, surf->feedback, &(surf->coded_buf->coded_size)); + surf->feedback = NULL; } pipe_mutex_unlock(drv->mutex); return VA_STATUS_SUCCESS; -- 2.30.2