diff options
| author | Nicolai Hähnle <[email protected]> | 2017-02-22 20:04:39 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-15 18:54:31 +0000 |
| commit | e59e2c664f3380642138bb27914237380ff778ce (patch) | |
| tree | 29eae6a5e89610a1d7520f825a0f2b8960ea23b5 /src/mesa | |
| parent | ea7711fc0f12dd5c1ee1594884cf543b77e35cf9 (diff) | |
st/glsl_to_tgsi: avoid iterating past the head of the instruction list
exec_node::get_prev() does not guard against going past the beginning
of the list, so we need to add explicit checks here.
Found by ASAN in piglit arb_shader_storage_buffer_object-rendering.
Cc: [email protected]
Signed-off-by: Marek Olšák <[email protected]>
(cherry picked from commit 911391bd70fe30ad970c5e56632b2d7ccc29d955)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index f9dc9b1ed52..fcf93f1a9a3 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -3432,10 +3432,17 @@ glsl_to_tgsi_visitor::visit_ssbo_intrinsic(ir_call *ir) inst->resource = buffer; if (access) inst->buffer_access = access->value.u[0]; + + if (inst == this->instructions.get_head_raw()) + break; inst = (glsl_to_tgsi_instruction *)inst->get_prev(); - if (inst->op == TGSI_OPCODE_UADD) + + if (inst->op == TGSI_OPCODE_UADD) { + if (inst == this->instructions.get_head_raw()) + break; inst = (glsl_to_tgsi_instruction *)inst->get_prev(); - } while (inst && inst->op == op && inst->resource.file == PROGRAM_UNDEFINED); + } + } while (inst->op == op && inst->resource.file == PROGRAM_UNDEFINED); } void |