Commit 6d90bf20 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

DirectSound: avoid crash on faulty audio device.

parent 9abcaacf
...@@ -93,6 +93,7 @@ struct aout_sys_t ...@@ -93,6 +93,7 @@ struct aout_sys_t
*****************************************************************************/ *****************************************************************************/
static int OpenAudio ( vlc_object_t * ); static int OpenAudio ( vlc_object_t * );
static void CloseAudio ( vlc_object_t * ); static void CloseAudio ( vlc_object_t * );
static void CloseAudioCommon ( vlc_object_t * );
static void Play ( audio_output_t *, block_t * ); static void Play ( audio_output_t *, block_t * );
/* local functions */ /* local functions */
...@@ -161,18 +162,10 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -161,18 +162,10 @@ static int OpenAudio( vlc_object_t *p_this )
msg_Dbg( p_aout, "Opening DirectSound Audio Output" ); msg_Dbg( p_aout, "Opening DirectSound Audio Output" );
/* Allocate structure */ /* Allocate structure */
p_aout->sys = malloc( sizeof( aout_sys_t ) ); p_aout->sys = calloc( 1, sizeof( aout_sys_t ) );
if( p_aout->sys == NULL ) if( unlikely( p_aout->sys == NULL ) )
return VLC_ENOMEM; return VLC_ENOMEM;
/* Initialize some variables */
p_aout->sys->p_dsobject = NULL;
p_aout->sys->p_dsbuffer = NULL;
p_aout->sys->p_notif = NULL;
p_aout->pf_play = Play;
p_aout->pf_pause = aout_PacketPause;
p_aout->pf_flush = aout_PacketFlush;
aout_VolumeSoftInit( p_aout ); aout_VolumeSoftInit( p_aout );
/* Retrieve config values */ /* Retrieve config values */
...@@ -198,8 +191,6 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -198,8 +191,6 @@ static int OpenAudio( vlc_object_t *p_this )
free( psz_speaker ); free( psz_speaker );
p_aout->sys->i_speaker_setup = i; p_aout->sys->i_speaker_setup = i;
p_aout->sys->p_device_guid = 0;
/* Initialise DirectSound */ /* Initialise DirectSound */
if( InitDirectSound( p_aout ) ) if( InitDirectSound( p_aout ) )
{ {
...@@ -236,8 +227,7 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -236,8 +227,7 @@ static int OpenAudio( vlc_object_t *p_this )
!= VLC_SUCCESS ) != VLC_SUCCESS )
{ {
msg_Err( p_aout, "cannot open directx audio device" ); msg_Err( p_aout, "cannot open directx audio device" );
free( p_aout->sys ); goto error;
return VLC_EGENERIC;
} }
aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB ); aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
...@@ -301,6 +291,11 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -301,6 +291,11 @@ static int OpenAudio( vlc_object_t *p_this )
/* Now we need to setup our DirectSound play notification structure */ /* Now we need to setup our DirectSound play notification structure */
p_aout->sys->p_notif = calloc( 1, sizeof( *p_aout->sys->p_notif ) ); p_aout->sys->p_notif = calloc( 1, sizeof( *p_aout->sys->p_notif ) );
if( unlikely( !p_aout->sys->p_notif ) )
{
CloseAudio( VLC_OBJECT(p_aout) );
return VLC_ENOMEM;
}
p_aout->sys->p_notif->p_aout = p_aout; p_aout->sys->p_notif->p_aout = p_aout;
vlc_atomic_set(&p_aout->sys->p_notif->abort, 0); vlc_atomic_set(&p_aout->sys->p_notif->abort, 0);
...@@ -317,13 +312,18 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -317,13 +312,18 @@ static int OpenAudio( vlc_object_t *p_this )
CloseHandle( p_aout->sys->p_notif->event ); CloseHandle( p_aout->sys->p_notif->event );
free( p_aout->sys->p_notif ); free( p_aout->sys->p_notif );
p_aout->sys->p_notif = NULL; p_aout->sys->p_notif = NULL;
goto error; CloseAudio( VLC_OBJECT(p_aout) );
return VLC_EGENERIC;
} }
p_aout->pf_play = Play;
p_aout->pf_pause = aout_PacketPause;
p_aout->pf_flush = aout_PacketFlush;
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
CloseAudio( VLC_OBJECT(p_aout) ); CloseAudioCommon( VLC_OBJECT(p_aout) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -585,6 +585,13 @@ static void Play( audio_output_t *p_aout, block_t *p_buffer ) ...@@ -585,6 +585,13 @@ static void Play( audio_output_t *p_aout, block_t *p_buffer )
* CloseAudio: close the audio device * CloseAudio: close the audio device
*****************************************************************************/ *****************************************************************************/
static void CloseAudio( vlc_object_t *p_this ) static void CloseAudio( vlc_object_t *p_this )
{
audio_output_t * p_aout = (audio_output_t *)p_this;
aout_PacketDestroy( p_aout );
CloseAudioCommon( p_this );
}
static void CloseAudioCommon( vlc_object_t *p_this )
{ {
audio_output_t * p_aout = (audio_output_t *)p_this; audio_output_t * p_aout = (audio_output_t *)p_this;
aout_sys_t *p_sys = p_aout->sys; aout_sys_t *p_sys = p_aout->sys;
...@@ -612,8 +619,9 @@ static void CloseAudio( vlc_object_t *p_this ) ...@@ -612,8 +619,9 @@ static void CloseAudio( vlc_object_t *p_this )
/* free DSOUND.DLL */ /* free DSOUND.DLL */
if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll ); if( p_sys->hdsound_dll ) FreeLibrary( p_sys->hdsound_dll );
free( p_aout->sys->p_device_guid );
aout_PacketDestroy( p_aout ); aout_PacketDestroy( p_aout );
free( p_aout->sys->p_device_guid );
free( p_sys ); free( p_sys );
} }
......
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