lavapipe: don't crash on null xfb buffer pointer

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17469>
(cherry picked from commit fb917a606c)
This commit is contained in:
Mike Blumenkrantz 2022-07-11 15:04:00 -04:00 committed by Dylan Baker
parent 3f76b2a272
commit cf26e274c7
2 changed files with 3 additions and 3 deletions

View file

@ -184,7 +184,7 @@
"description": "lavapipe: don't crash on null xfb buffer pointer",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -3372,7 +3372,7 @@ static void handle_begin_transform_feedback(struct vk_cmd_queue_entry *cmd,
memset(offsets, 0, sizeof(uint32_t)*4);
for (unsigned i = 0; i < btf->counter_buffer_count; i++) {
for (unsigned i = 0; btf->counter_buffers && i < btf->counter_buffer_count; i++) {
if (!btf->counter_buffers[i])
continue;
@ -3392,7 +3392,7 @@ static void handle_end_transform_feedback(struct vk_cmd_queue_entry *cmd,
struct vk_cmd_end_transform_feedback_ext *etf = &cmd->u.end_transform_feedback_ext;
if (etf->counter_buffer_count) {
for (unsigned i = 0; i < etf->counter_buffer_count; i++) {
for (unsigned i = 0; etf->counter_buffers && i < etf->counter_buffer_count; i++) {
if (!etf->counter_buffers[i])
continue;