KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

si_descriptor: move velems nullity check before dereference 

CID 1399479: Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking velems suggests that it may be null,
but it has already been dereferenced on all paths leading to the check.

Signed-off-by: Julien Isorce <jisorce@oblong.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Julien Isorce 2017-03-16 13:09:21 +00:00
parent 521860b2a9
commit a6e2124402
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -949,15 +949,22 @@ bool si_upload_vertex_buffer_descriptors(struct si_context *sctx)
{
struct si_vertex_element *velems = sctx->vertex_elements;
struct si_descriptors *desc = &sctx->vertex_buffers;
unsigned i, count = velems->count;
unsigned desc_list_byte_size = velems->desc_list_byte_size;
unsigned i, count;
unsigned desc_list_byte_size;
unsigned first_vb_use_mask;
uint64_t va;
uint32_t *ptr;
if (!sctx->vertex_buffers_dirty || !count || !velems)
if (!sctx->vertex_buffers_dirty || !velems)
return true;
unsigned first_vb_use_mask = velems->first_vb_use_mask;
count = velems->count;
if (!count)
return true;
desc_list_byte_size = velems->desc_list_byte_size;
first_vb_use_mask = velems->first_vb_use_mask;
/* Vertex buffer descriptors are the only ones which are uploaded
* directly through a staging buffer and don't go through