Commit: 2e90a47d9ec2c28907d5530fccb1de04bf715c14 - hardware-intel-libva (git)

hardware/intel/libva

Commit MetaInfo

• Revisión: 2e90a47d9ec2c28907d5530fccb1de04bf715c14 (tree)
• Tiempo: 2014-09-09 02:17:44
• Autor: Austin Yuan <shengquan.yuan@inte...>
• Commiter: Xiang, Haihao

Log Message

vatrace: fix segfault of VASurfaceAttribExternalBufferDescriptor dumpping

Signed-off-by: Austin Yuan <[e-mail]>
(cherry picked from commit e286c3264ebf7582792ff56537dd14c9f49903cf)

Cambiar Resumen

• modified: va/va_trace.c

Diferencia incremental

--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -481,7 +481,7 @@ static void va_TraceSurfaceAttributes(
             break;
         case VAGenericValueTypePointer:
             va_TraceMsg(trace_ctx, "\t\tvalue.value.p = %p\n", p->value.value.p);
-            if (type == VASurfaceAttribExternalBufferDescriptor) {
+            if ((p->type == VASurfaceAttribExternalBufferDescriptor) && p->value.value.p) {
                 VASurfaceAttribExternalBuffers *tmp = (VASurfaceAttribExternalBuffers *) p->value.value.p;
                 int j;
                 
@@ -499,7 +499,7 @@ static void va_TraceSurfaceAttributes(
                 va_TraceMsg(trace_ctx, "\t\t  num_buffers=0x%08x\n", tmp->num_buffers);
                 va_TraceMsg(trace_ctx, "\t\t  buffers=%p\n", tmp->buffers);
                 for (j = 0; j < tmp->num_buffers; j++) {
-                    va_TraceMsg(trace_ctx, "\t\t\tbuffers[%j]=%p\n", tmp->buffers[j]);
+                    va_TraceMsg(trace_ctx, "\t\t\tbuffers[%d]=%p\n", j, tmp->buffers[j]);
                 }
             }
             break;