Commit: c3ab994edf2a20e9e8c96dce8883c1df99b88849 - hardware-intel-libva (git)

hardware/intel/libva

Commit MetaInfo

• Révision: c3ab994edf2a20e9e8c96dce8883c1df99b88849 (tree)
• l'heure: 2011-12-14 09:27:03
• Auteur: Xiang, Haihao <haihao.xiang@inte...>
• Commiter: Xiang, Haihao

Message de Log

Array bound check

Signed-off-by: Xiang, Haihao <[e-mail]>

Change Summary

• modified: va/egl/va_egl.c
• modified: va/egl/va_egl_impl.c
• modified: va/egl/va_egl_impl.h

Modification

--- a/va/egl/va_egl.c
+++ b/va/egl/va_egl.c
@@ -183,7 +183,7 @@ int vaMaxNumSurfaceTargetsEGL(
     if (va_egl)
         return va_egl->max_egl_surface_targets;
     else
-        return 2;
+        return IMPL_MAX_EGL_SURFACE_TARGETS;
 }
 
 int vaMaxNumSurfaceAttributesEGL(
@@ -200,7 +200,7 @@ int vaMaxNumSurfaceAttributesEGL(
     if (va_egl)
         return va_egl->max_egl_surface_attributes;
     else
-        return 2;
+        return IMPL_MAX_EGL_SURFACE_ATTRIBUTES;
 }
 
 VAStatus vaQuerySurfaceTargetsEGL(

--- a/va/egl/va_egl_impl.c
+++ b/va/egl/va_egl_impl.c
@@ -282,8 +282,10 @@ vaQuerySurfaceTargetsEGL_impl_libva(VADisplay dpy,
 {
     int i = 0;
 
+    /* FIXME: support other targets ??? */
     target_list[i++] = EGL_NATIVE_PIXMAP_KHR;
     *num_targets = i;
+    assert(i <= IMPL_MAX_EGL_SURFACE_TARGETS);
 
     return VA_STATUS_SUCCESS;
 }
@@ -297,6 +299,10 @@ vaCreateSurfaceEGL_impl_libva(VADisplay dpy,
 {
     VASurfaceImplEGLP pSurfaceImplEGL = NULL;
 
+    /* So far only support for EGL_NATIVE_PIXMAP_KHR */
+    if (target != 0 && target != EGL_NATIVE_PIXMAP_KHR)
+        return VA_STATUS_ERROR_INVALID_PARAMETER;
+
     pSurfaceImplEGL = calloc(1, sizeof(*pSurfaceImplEGL));
 
     if (!pSurfaceImplEGL) {
@@ -400,18 +406,23 @@ vaGetSurfaceInfoEGL_impl_libva(VADisplay dpy,
     if (pSurfaceImplEGL->surface == VA_INVALID_SURFACE)
         return VA_STATUS_ERROR_INVALID_SURFACE;
 
+    if (*num_attribs < IMPL_MAX_EGL_SURFACE_ATTRIBUTES)
+        return VA_STATUS_ERROR_INVALID_PARAMETER;
+
     *target = pSurfaceImplEGL->target;
     *buffer = pSurfaceImplEGL->buffer;
 
     if (pSurfaceImplEGL->target == EGL_NATIVE_PIXMAP_KHR) {
         attrib_list[i++] = EGL_IMAGE_PRESERVED_KHR;
-        attrib_list[i++] = EGL_TRUE;
+        attrib_list[i + 1] = EGL_TRUE;
         attrib_list[i++] = EGL_NONE;
     } else {
         /* FIXME later */
         attrib_list[i++] = EGL_NONE;
     }
 
+    *num_attribs = i;
+
     return VA_STATUS_SUCCESS;
 }
 

--- a/va/egl/va_egl_impl.h
+++ b/va/egl/va_egl_impl.h
@@ -1,6 +1,10 @@
 #ifndef _VA_EGL_IMPL_H_
 #define _VA_EGL_IMPL_H_
 
+#define IMPL_MAX_EGL_SURFACE_TARGETS    4
+#define IMPL_MAX_EGL_SURFACE_ATTRIBUTES 8
+
+
 /**
  * Initialize EGL driver context
  *