GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

opengl/utils: use uintptr_t for arithmetics with possible zero value

Browse Source 
Fixes UBSAN warnings, applying non-zero offset to null pointer.
This commit is contained in:
Kacper Michajłow
2025-03-13 12:21:16 +01:00
parent bd3ff140fa
commit b32cf754e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/opengl/utils.c
+3 -3
View File
@@ -80,7 +80,7 @@ void gl_upload_tex(GL *gl, GLenum target, GLenum format, GLenum type,
int x, int y, int w, int h)
{
int bpp = gl_bytes_per_pixel(format, type);
const uint8_t *data = dataptr;
uintptr_t data = (uintptr_t)dataptr;
int y_max = y + h;
if (w <= 0 || h <= 0 || !bpp)
return;
@@ -95,11 +95,11 @@ void gl_upload_tex(GL *gl, GLenum target, GLenum format, GLenum type,
slice = 1; // very inefficient, but at least it works
}
for (; y + slice <= y_max; y += slice) {
gl->TexSubImage2D(target, 0, x, y, w, slice, format, type, data);
gl->TexSubImage2D(target, 0, x, y, w, slice, format, type, (void *)data);
data += stride * slice;
}
if (y < y_max)
gl->TexSubImage2D(target, 0, x, y, w, y_max - y, format, type, data);
gl->TexSubImage2D(target, 0, x, y, w, y_max - y, format, type, (void *)data);
if (gl->mpgl_caps & MPGL_CAP_ROW_LENGTH)
gl->PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4);