提交: ec0e66e57c4ee66b89a9a886f9d464da5893aac8 - hardware-intel-libva (git)

hardware/intel/libva

Commit MetaInfo

• 修訂: ec0e66e57c4ee66b89a9a886f9d464da5893aac8 (tree)
• 時間: 2009-11-23 17:19:36
• 作者: Austin Yuan <shengquan.yuan@inte...>
• Commiter: Austin Yuan

Log Message

Added a "magic" number to VADisplayContext in case an illeal VA dpy passed in

Signed-off-by: Austin Yuan <[e-mail]>

Change Summary

• modified: src/va.c
• modified: src/va_backend.h
• modified: src/x11/va_x11.c

差異

--- a/src/va.c
+++ b/src/va.c
@@ -58,7 +58,7 @@ static int va_debug_trace = 0;
 static int vaDisplayIsValid(VADisplay dpy)
 {
   VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-  return pDisplayContext && pDisplayContext->vaIsValid(pDisplayContext);
+  return pDisplayContext && (pDisplayContext->vadpy_magic == 0x789abcde) && pDisplayContext->vaIsValid(pDisplayContext);
 }
 
 static void va_errorMessage(const char *msg, ...)

--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -398,6 +398,8 @@ struct VADriverContext
 
 struct VADisplayContext
 {
+    int vadpy_magic;
+    
     VADisplayContextP pNext;
     VADriverContextP pDriverContext;
 

--- a/src/x11/va_x11.c
+++ b/src/x11/va_x11.c
@@ -189,6 +189,8 @@ VADisplay vaGetDisplay (
       dri_state       = calloc(1, sizeof(*dri_state));
       if (pDisplayContext && pDriverContext && dri_state)
       {
+	  pDisplayContext->vadpy_magic = 0x789abcde;          
+
 	  pDriverContext->x11_dpy          = native_dpy;
 	  pDisplayContext->pNext           = pDisplayContexts;
 	  pDisplayContext->pDriverContext  = pDriverContext;