fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-27 20:58:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

trace: Prevent segfault when passing NULL to set_vertex_buffers.

Browse source 
State tracker now passes NULL buffer array to unbind buffers.
This commit is contained in:
José Fonseca 2012-11-05 11:18:07 +00:00
parent 99c45c5aa4
commit 3700bd1158
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/trace/tr_context.c
View file

@ -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++)

36
src/gallium/drivers/trace/tr_dump.h
View file

@ -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) \