RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 15:29:56 +00:00
Code Issues Releases Wiki Activity

video/out/gpu: Fix compilation warning of out of bound access

Browse Source 
Make the index into the arrays in copy_image()
unsigned to make compiler trust that we dont access
out of bounds.
This commit is contained in:
Mika Kuoppala 2023-03-17 14:45:52 +02:00 committed by Leo Izen
parent 1808f264b3
commit 95d7b05e71
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
video/out/gpu/video.c
View File

@ -1338,18 +1338,20 @@ static const char *get_tex_swizzle(struct image *img)
// Copy a texture to the vec4 color, while increasing offset. Also applies
// the texture multiplier to the sampled color
static void copy_image(struct gl_video *p, int *offset, struct image img)
static void copy_image(struct gl_video *p, unsigned int *offset, struct image img)
{
int count = img.components;
assert(*offset + count <= 4);
assert(img.padding + count <= 4);
int id = pass_bind(p, img);
const unsigned int count = img.components;
char src[5] = {0};
char dst[5] = {0};
assert(*offset + count < sizeof(dst));
assert(img.padding + count < sizeof(src));
int id = pass_bind(p, img);
const char *tex_fmt = get_tex_swizzle(&img);
const char *dst_fmt = "rgba";
for (int i = 0; i < count; i++) {
for (unsigned int i = 0; i < count; i++) {
src[i] = tex_fmt[img.padding + i];
dst[i] = dst_fmt[*offset + i];
}