Mesa (master): st/va: add more errors checks in vlVaBufferSetNumElements and vlVaMapBuffer

Christian König deathsimple at kemper.freedesktop.org
Fri Oct 30 12:31:59 UTC 2015


Module: Mesa
Branch: master
Commit: 5e763aaa21654d0591b7da14c573fc03d4a60205
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e763aaa21654d0591b7da14c573fc03d4a60205

Author: Julien Isorce <j.isorce at samsung.com>
Date:   Fri Oct 30 11:42:51 2015 +0000

st/va: add more errors checks in vlVaBufferSetNumElements and vlVaMapBuffer

Signed-off-by: Julien Isorce <j.isorce at samsung.com>
Reviewed-by: Christian König <christian.koenig at amd.com>

---

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

diff --git a/src/gallium/state_trackers/va/buffer.c b/src/gallium/state_trackers/va/buffer.c
index 8f9ba44..f5b9e81 100644
--- a/src/gallium/state_trackers/va/buffer.c
+++ b/src/gallium/state_trackers/va/buffer.c
@@ -73,6 +73,9 @@ vlVaBufferSetNumElements(VADriverContextP ctx, VABufferID buf_id,
       return VA_STATUS_ERROR_INVALID_CONTEXT;
 
    buf = handle_table_get(VL_VA_DRIVER(ctx)->htab, buf_id);
+   if (!buf)
+      return VA_STATUS_ERROR_INVALID_BUFFER;
+
    buf->data = REALLOC(buf->data, buf->size * buf->num_elements,
                        buf->size * num_elements);
    buf->num_elements = num_elements;
@@ -91,6 +94,9 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff)
    if (!ctx)
       return VA_STATUS_ERROR_INVALID_CONTEXT;
 
+   if (!pbuff)
+      return VA_STATUS_ERROR_INVALID_PARAMETER;
+
    buf = handle_table_get(VL_VA_DRIVER(ctx)->htab, buf_id);
    if (!buf)
       return VA_STATUS_ERROR_INVALID_BUFFER;




More information about the mesa-commit mailing list