fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3dv: do not pass NULL pointer to function not expecting NULLs

Browse source 
memcpy() pointers arguments are declared to be non NULL.

This has been detected by Undefined Behaviour Sanitizer (UBSan).

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29911>
This commit is contained in:
Juan A. Suarez Romero 2024-06-26 10:14:15 +02:00 • committed by Marge Bot
parent 1d71be8e60
commit 3ee47dc6d9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/broadcom/vulkan/v3dv_cmd_buffer.c
View file

@ -2544,8 +2544,10 @@ v3dv_cmd_buffer_meta_state_push(struct v3dv_cmd_buffer *cmd_buffer,
state->meta.attachment_alloc_count = state->attachment_alloc_count;
}
state->meta.attachment_count = state->attachment_alloc_count;
memcpy(state->meta.attachments, state->attachments,
attachment_state_total_size);
if (state->meta.attachments) {
memcpy(state->meta.attachments, state->attachments,
attachment_state_total_size);
}
if (state->subpass_idx != -1) {
state->meta.subpass_idx = state->subpass_idx;
@ -2599,8 +2601,10 @@ v3dv_cmd_buffer_meta_state_pop(struct v3dv_cmd_buffer *cmd_buffer,
sizeof(struct v3dv_cmd_buffer_attachment_state);
const uint32_t attachment_state_total_size =
attachment_state_item_size * state->meta.attachment_count;
memcpy(state->attachments, state->meta.attachments,
attachment_state_total_size);
if (attachment_state_total_size > 0) {
memcpy(state->attachments, state->meta.attachments,
attachment_state_total_size);
}
if (state->meta.subpass_idx != -1) {
state->pass = v3dv_render_pass_from_handle(state->meta.pass);
@ -3945,7 +3949,8 @@ v3dv_cmd_buffer_ensure_array_state(struct v3dv_cmd_buffer *cmd_buffer,
return;
}
memcpy(*ptr, old_buffer, prev_slot_count * slot_size);
if (old_buffer)
memcpy(*ptr, old_buffer, prev_slot_count * slot_size);
*alloc_count = new_slot_count;
}
assert(used_count < *alloc_count);