Mesa (11.2): va: check null context in vlVaDestroyContext

Emil Velikov evelikov at kemper.freedesktop.org
Thu Apr 14 19:39:07 UTC 2016


Module: Mesa
Branch: 11.2
Commit: 106c1facae8f8e2e27d670397d1276958f0143c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=106c1facae8f8e2e27d670397d1276958f0143c4

Author: Iurie Salomov <iurcic at gmail.com>
Date:   Tue Apr 12 23:24:30 2016 +0100

va: check null context in vlVaDestroyContext

Signed-off-by: Iurie Salomov <iurcic at gmail.com>
Reviewed-by: Julien Isorce <j.isorce at samsung.com>
(cherry picked from commit 047e3264f67bc54365be7b0e163b6910a9e9de3a)
Nominated-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/state_trackers/va/context.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
index b25c381..25d587a 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -283,6 +283,10 @@ vlVaDestroyContext(VADriverContextP ctx, VAContextID context_id)
    drv = VL_VA_DRIVER(ctx);
    pipe_mutex_lock(drv->mutex);
    context = handle_table_get(drv->htab, context_id);
+   if (!context) {
+      pipe_mutex_unlock(drv->mutex);
+      return VA_STATUS_ERROR_INVALID_CONTEXT;
+   }
 
    if (context->decoder) {
       if (u_reduce_video_profile(context->decoder->profile) ==




More information about the mesa-commit mailing list