Commit 4eb79afc authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

Check malloc return value

parent 2c5cd248
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_sout.h> #include <vlc_sout.h>
#include <vlc_network.h> #include <vlc_network.h>
#include "vlc_url.h" #include "vlc_url.h"
...@@ -172,12 +171,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -172,12 +171,12 @@ static int Open( vlc_object_t *p_this )
psz_mux = *val.psz_string ? val.psz_string : NULL; psz_mux = *val.psz_string ? val.psz_string : NULL;
if( !*val.psz_string ) free( val.psz_string ); if( !*val.psz_string ) free( val.psz_string );
var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
psz_url = *val.psz_string ? val.psz_string : NULL; psz_url = *val.psz_string ? val.psz_string : NULL;
if( !*val.psz_string ) free( val.psz_string ); if( !*val.psz_string ) free( val.psz_string );
p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) );
if( !p_sys ) return VLC_ENOMEM;
p_stream->p_sys->p_session = NULL; p_stream->p_sys->p_session = NULL;
msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url ); msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url );
......
...@@ -526,6 +526,11 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) ...@@ -526,6 +526,11 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt )
/* create a new sout input */ /* create a new sout input */
p_input = malloc( sizeof( sout_input_t ) ); p_input = malloc( sizeof( sout_input_t ) );
if( !p_input )
{
msg_Err( p_mux, "out of memory" );
return NULL;
}
p_input->p_sout = p_mux->p_sout; p_input->p_sout = p_mux->p_sout;
p_input->p_fmt = p_fmt; p_input->p_fmt = p_fmt;
p_input->p_fifo = block_FifoNew( p_mux->p_sout ); p_input->p_fifo = block_FifoNew( p_mux->p_sout );
......
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