mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

extra checks on size of OSD parts (though IMHO these values should never be bad)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17876 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-03-15 21:13:13 +00:00
parent 122744d6ed
commit 33f64f9e05
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvo/vo_gl.c
View File

@ -436,6 +436,11 @@ static void create_osd_texture(int x0, int y0, int w, int h,
// initialize to 8 to avoid special-casing on alignment
int sx = 8, sy = 8;
GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST;
if (w <= 0 || h <= 0 || stride < w) {
mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
return;
}
texSize(w, h, &sx, &sy);
if (osdtexCnt >= MAX_OSD_PARTS) {
@ -459,7 +464,7 @@ static void create_osd_texture(int x0, int y0, int w, int h,
char *tmp = (char *)malloc(stride * h);
// convert alpha from weird MPlayer scale.
// in-place is not possible since it is reused for future OSDs
for (i = h * stride - 1; i; i--)
for (i = h * stride - 1; i > 0; i--)
tmp[i] = srca[i] - 1;
glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride,
0, 0, w, h, 0);