RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

checkings for malloc results (potential memleaks) 

btw: C functions in .h files is dirty :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3612 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2001-12-19 12:54:06 +00:00
parent 35c39674d7
commit d8925752b8
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/tvi_def.h
View File

@ -45,8 +45,9 @@ static tvi_handle_t *new_handle()
static void free_handle(tvi_handle_t *h)
{
if (h->priv)
free(h->priv);
if (h)
if (h) {
if (h->priv)
free(h->priv);
free(h);
}
}

24
libmpdemux/tvi_v4l.c
View File

@ -227,14 +227,14 @@ tvi_handle_t *tvi_init_v4l(char *device)
/* set video device name */
if (!device)
{
priv->video_device = (char *)malloc(strlen("/dev/video0"));
sprintf(priv->video_device, "/dev/video0");
}
priv->video_device = strdup("/dev/video0");
else
{
priv->video_device = (char *)malloc(strlen(device));
strcpy(priv->video_device, device);
priv->video_device = strdup(device);
/* allocation failed */
if (!priv->video_device) {
free_handle(h);
return(NULL);
}
return(h);
@ -278,6 +278,8 @@ static int init(priv_t *priv, tvi_param_t *params)
mp_msg(MSGT_TV, MSGL_INFO, " Inputs: %d\n", priv->capability.channels);
priv->channels = (struct video_channel *)malloc(sizeof(struct video_channel)*priv->capability.channels);
if (!priv->channels)
goto malloc_failed;
memset(priv->channels, 0, sizeof(struct video_channel)*priv->capability.channels);
for (i = 0; i < priv->capability.channels; i++)
{
@ -357,10 +359,18 @@ static int init(priv_t *priv, tvi_param_t *params)
/* video buffers */
priv->buf = (struct video_mmap *)malloc(priv->nbuf * sizeof(struct video_mmap));
if (!priv->buf)
goto malloc_failed;
memset(priv->buf, 0, priv->nbuf * sizeof(struct video_mmap));
return(1);
malloc_failed:
if (priv->channels)
free(priv->channels);
if (priv->buf)
free(priv->buf);
err:
if (priv->fd != -1)
close(priv->fd);