Enlarge the size of array misc_param

And check the type before storing misc parameters

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 178a0f2..1703dfb 100755 (executable)
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -2148,6 +2148,10 @@ i965_encoder_render_misc_parameter_buffer(VADriverContextP ctx,
     assert(obj_buffer->buffer_store->buffer);
 
     param = (VAEncMiscParameterBuffer *)obj_buffer->buffer_store->buffer;
+
+    if (param->type > ARRAY_ELEMS(encode->misc_param))
+        return VA_STATUS_ERROR_INVALID_PARAMETER;
+
     i965_release_buffer_store(&encode->misc_param[param->type]);
     i965_reference_buffer_store(&encode->misc_param[param->type], obj_buffer->buffer_store);
 

diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h
index f51f39f..ccf9a59 100644 (file)
--- a/src/i965_drv_video.h
+++ b/src/i965_drv_video.h
@@ -138,7 +138,7 @@ struct encode_state
     int num_slice_params_ext;
     int last_packed_header_type;
 
-    struct buffer_store *misc_param[8];
+    struct buffer_store *misc_param[16];
 
     VASurfaceID current_render_target;
     struct object_surface *input_yuv_object;