Commit c4f8422a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Memory leak (fix #2448)

N.B.: I hate branching macros for a reason
parent bfbea33c
...@@ -346,7 +346,15 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self, ...@@ -346,7 +346,15 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
} }
p_media = libvlc_media_player_get_media( self->p_media_player, &ex ); p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex ); if( libvlc_exception_raised( &ex ) )
{
free( retval );
RAISE( mediacontrol_InternalException,
libvlc_exception_get_message( &ex ) );
libvlc_exception_clear( &ex );
return NULL;
}
if( ! p_media ) if( ! p_media )
{ {
/* No p_media defined */ /* No p_media defined */
...@@ -358,8 +366,17 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self, ...@@ -358,8 +366,17 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
else else
{ {
libvlc_state_t state; libvlc_state_t state;
state = libvlc_media_player_get_state( self->p_media_player, &ex ); state = libvlc_media_player_get_state( self->p_media_player, &ex );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex ); if( libvlc_exception_raised( &ex ) )
{
free( retval );
RAISE( mediacontrol_InternalException,
libvlc_exception_get_message( &ex ) );
libvlc_exception_clear( &ex );
return NULL;
}
switch( state ) switch( state )
{ {
case libvlc_NothingSpecial: case libvlc_NothingSpecial:
......
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