summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2014-03-26 07:44:03 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2014-09-09 01:17:44 +0800
commit2e90a47d9ec2c28907d5530fccb1de04bf715c14 (patch)
tree626ab13b2ac9a184f3645ef75fac49b1dad78557
parent5d4faa102b49ef6dbf8a1fcd04a82a8c04030e6a (diff)
vatrace: fix segfault of VASurfaceAttribExternalBufferDescriptor dumpping
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com> (cherry picked from commit e286c3264ebf7582792ff56537dd14c9f49903cf)
-rw-r--r--va/va_trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/va/va_trace.c b/va/va_trace.c
index 5df619a..910ecb6 100644
--- 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;