Mesa (master): trace: Prevent segfault when passing NULL to set_vertex_buffers.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Nov 5 11:18:30 UTC 2012
Module: Mesa
Branch: master
Commit: 3700bd115841958cc9c211475d3069298e4ff266
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3700bd115841958cc9c211475d3069298e4ff266
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Nov 5 11:18:07 2012 +0000
trace: Prevent segfault when passing NULL to set_vertex_buffers.
State tracker now passes NULL buffer array to unbind buffers.
---
src/gallium/drivers/trace/tr_context.c | 2 +-
src/gallium/drivers/trace/tr_dump.h | 36 +++++++++++++++++++------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index ba1882e..fed95c6 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -1077,7 +1077,7 @@ trace_context_set_vertex_buffers(struct pipe_context *_pipe,
trace_dump_struct_array(vertex_buffer, buffers, num_buffers);
trace_dump_arg_end();
- if (num_buffers) {
+ if (buffers) {
struct pipe_vertex_buffer *_buffers = MALLOC(num_buffers * sizeof(*_buffers));
memcpy(_buffers, buffers, num_buffers * sizeof(*_buffers));
for (i = 0; i < num_buffers; i++)
diff --git a/src/gallium/drivers/trace/tr_dump.h b/src/gallium/drivers/trace/tr_dump.h
index 5739e86..ef01292 100644
--- a/src/gallium/drivers/trace/tr_dump.h
+++ b/src/gallium/drivers/trace/tr_dump.h
@@ -137,26 +137,34 @@ void trace_dump_transfer_ptr(struct pipe_transfer *_transfer);
#define trace_dump_array(_type, _obj, _size) \
do { \
- size_t idx; \
- trace_dump_array_begin(); \
- for(idx = 0; idx < (_size); ++idx) { \
- trace_dump_elem_begin(); \
- trace_dump_##_type((_obj)[idx]); \
- trace_dump_elem_end(); \
+ if (_obj) { \
+ size_t idx; \
+ trace_dump_array_begin(); \
+ for(idx = 0; idx < (_size); ++idx) { \
+ trace_dump_elem_begin(); \
+ trace_dump_##_type((_obj)[idx]); \
+ trace_dump_elem_end(); \
+ } \
+ trace_dump_array_end(); \
+ } else { \
+ trace_dump_null(); \
} \
- trace_dump_array_end(); \
} while(0)
#define trace_dump_struct_array(_type, _obj, _size) \
do { \
- size_t idx; \
- trace_dump_array_begin(); \
- for(idx = 0; idx < (_size); ++idx) { \
- trace_dump_elem_begin(); \
- trace_dump_##_type(&(_obj)[idx]); \
- trace_dump_elem_end(); \
+ if (_obj) { \
+ size_t idx; \
+ trace_dump_array_begin(); \
+ for(idx = 0; idx < (_size); ++idx) { \
+ trace_dump_elem_begin(); \
+ trace_dump_##_type(&(_obj)[idx]); \
+ trace_dump_elem_end(); \
+ } \
+ trace_dump_array_end(); \
+ } else { \
+ trace_dump_null(); \
} \
- trace_dump_array_end(); \
} while(0)
#define trace_dump_member(_type, _obj, _member) \
More information about the mesa-commit
mailing list