Skip to content

V
vlc-1.1
Commit 48aef0f0 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

vout_fb: fix a potential memleak and some cleanings.

parent 1ece85a6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
modules/video_output/fb.c
View file @ 48aef0f0
/***************************************************************************** /*****************************************************************************
* fb.c : framebuffer plugin for vlc * fb.c : framebuffer plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 the VideoLAN team * Copyright (C) 2000-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -186,10 +186,9 @@ static int Create( vlc_object_t *p_this ) ...@@ -186,10 +186,9 @@ static int Create( vlc_object_t *p_this )
struct termios new_termios; struct termios new_termios;
/* Allocate instance and initialize some members */ /* Allocate instance and initialize some members */
p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); p_vout->p_sys = p_sys = calloc( 1, sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL ) if( p_vout->p_sys == NULL )
return VLC_ENOMEM; return VLC_ENOMEM;
memset( p_sys, 0, sizeof(vout_sys_t) );
p_sys->p_video = MAP_FAILED; p_sys->p_video = MAP_FAILED;
...@@ -212,6 +211,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -212,6 +211,7 @@ static int Create( vlc_object_t *p_this )
if( p_sys->b_tty && !isatty( 0 ) ) if( p_sys->b_tty && !isatty( 0 ) )
{ {
msg_Warn( p_vout, "fd 0 is not a TTY" ); msg_Warn( p_vout, "fd 0 is not a TTY" );
free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
else else
...@@ -239,7 +239,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -239,7 +239,6 @@ static int Create( vlc_object_t *p_this )
psz_chroma ); psz_chroma );
} }
free( psz_chroma ); free( psz_chroma );
psz_chroma = NULL;
} }
p_sys->i_aspect = -1; p_sys->i_aspect = -1;
...@@ -258,7 +257,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -258,7 +257,6 @@ static int Create( vlc_object_t *p_this )
atoi( psz_aspect ), atoi( psz_parser ) ); atoi( psz_aspect ), atoi( psz_parser ) );
free( psz_aspect ); free( psz_aspect );
psz_aspect = NULL;
} }
p_sys->b_auto = false; p_sys->b_auto = false;
...@@ -284,7 +282,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -284,7 +282,6 @@ static int Create( vlc_object_t *p_this )
case 4: case 4:
default: default:
p_sys->b_auto = true; p_sys->b_auto = true;
break;
} }
/* tty handling */ /* tty handling */
...@@ -783,7 +780,6 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -783,7 +780,6 @@ static int OpenDisplay( vout_thread_t *p_vout )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
free( psz_device ); free( psz_device );
psz_device = NULL;
/* Get framebuffer device information */ /* Get framebuffer device information */
if( ioctl( p_sys->i_fd, FBIOGET_VSCREENINFO, &p_sys->var_info ) ) if( ioctl( p_sys->i_fd, FBIOGET_VSCREENINFO, &p_sys->var_info ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment