RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

3 memory leaks fixed

Browse Source 
Xlib funtions allocate memory that should be freed appropriately


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13954 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
iive 2004-11-15 14:56:18 +00:00
parent d4f6145e89
commit b3dcfc7ec6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libvo/vo_xv.c
View File

@ -68,7 +68,7 @@ static void allocate_xvimage(int);
static unsigned int ver, rel, req, ev, err; static unsigned int ver, rel, req, ev, err;
static unsigned int formats, adaptors, xv_port, xv_format; static unsigned int formats, adaptors, xv_port, xv_format;
static XvAdaptorInfo *ai = NULL; static XvAdaptorInfo *ai = NULL;
static XvImageFormatValues *fo; static XvImageFormatValues *fo=NULL;
static int current_buf = 0; static int current_buf = 0;
static int current_ip_buf = 0; static int current_ip_buf = 0;
@ -761,6 +761,10 @@ static void uninit(void)
return; return;
XvFreeAdaptorInfo(ai); XvFreeAdaptorInfo(ai);
ai = NULL; ai = NULL;
if(fo){
XFree(fo);
fo=NULL;
}
for (i = 0; i < num_buffers; i++) for (i = 0; i < num_buffers; i++)
deallocate_xvimage(i); deallocate_xvimage(i);
#ifdef HAVE_XF86VM #ifdef HAVE_XF86VM
@ -878,7 +882,7 @@ static uint32_t preinit(const char *arg)
{ {
int howmany, i; int howmany, i;
const XvAttribute *const attributes = XvAttribute * const attributes =
XvQueryPortAttributes(mDisplay, xv_port, &howmany); XvQueryPortAttributes(mDisplay, xv_port, &howmany);
for (i = 0; i < howmany && attributes; i++) for (i = 0; i < howmany && attributes; i++)
@ -889,6 +893,7 @@ static uint32_t preinit(const char *arg)
XvSetPortAttribute(mDisplay, xv_port, autopaint, 1); XvSetPortAttribute(mDisplay, xv_port, autopaint, 1);
break; break;
} }
XFree(attributes);
} }
fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats); fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats);

1
libvo/x11_common.c
View File

@ -178,6 +178,7 @@ void vo_hidecursor(Display * disp, Window win)
XFreeCursor(disp, no_ptr); XFreeCursor(disp, no_ptr);
if (bm_no != None) if (bm_no != None)
XFreePixmap(disp, bm_no); XFreePixmap(disp, bm_no);
XFreeColors(disp,colormap,&black.pixel,1,0);
} }
void vo_showcursor(Display * disp, Window win) void vo_showcursor(Display * disp, Window win)