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 2

i965: verify format width in blorp_get_client_bo

Browse source 
Coverity complains about possible "Division or modulo by zero".

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6126>
This commit is contained in:
Marcin Ślusarz 2020-07-30 14:56:44 +02:00 • committed by Marge Bot
parent 5e676ac671
commit 0789f4b6d8
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/drivers/dri/i965/brw_blorp.c
View file

@ -853,7 +853,6 @@ blorp_get_client_bo(struct brw_context *brw,
format, type,
d - 1, h - 1, w);
const uint32_t stride = _mesa_image_row_stride(packing, w, format, type);
const uint32_t cpp = _mesa_bytes_per_pixel(format, type);
const uint32_t size = last_pixel - first_pixel;
*row_stride_out = stride;
@ -861,9 +860,15 @@ blorp_get_client_bo(struct brw_context *brw,
if (packing->BufferObj) {
const uint32_t offset = first_pixel + (intptr_t)pixels;
if (!read_only && ((offset % cpp) || (stride % cpp))) {
perf_debug("Bad PBO alignment; fallback to CPU mapping\n");
return NULL;
if (!read_only) {
const int32_t cpp = _mesa_bytes_per_pixel(format, type);
assert(cpp > 0);
if ((offset % cpp) || (stride % cpp)) {
perf_debug("Bad PBO alignment; fallback to CPU mapping\n");
return NULL;
}
}
/* This is a user-provided PBO. We just need to get the BO out */