Do not assert memory allocations

[vlc] / modules / stream_out / bridge.c

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 127634c4c15b83f2de07844dac41fd6ca9c4a1c1..aec3854732abb542ecfa4a2858b31fefadbb6587 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -30,13 +30,10 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
-#include <vlc_memory.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -198,7 +195,8 @@ static int OpenOut( vlc_object_t *p_this )
                    p_stream->p_cfg );
 
     p_sys          = malloc( sizeof( out_sout_stream_sys_t ) );
-    assert( p_sys );
+    if( unlikely( !p_sys ) )
+        return VLC_ENOMEM;
     p_sys->b_inited = false;
 
     var_Create( p_this->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
@@ -261,8 +259,7 @@ static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
     p_bridge = var_GetAddress( p_stream->p_libvlc, p_sys->psz_name );
     if ( p_bridge == NULL )
     {
-        p_bridge = malloc( sizeof( bridge_t ) );
-        assert( p_bridge );
+        p_bridge = xmalloc( sizeof( bridge_t ) );
 
         var_Create( p_stream->p_libvlc, p_sys->psz_name, VLC_VAR_ADDRESS );
         var_SetAddress( p_stream->p_libvlc, p_sys->psz_name, p_bridge );
@@ -279,12 +276,10 @@ static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     if ( i == p_bridge->i_es_num )
     {
-        p_bridge->pp_es = realloc_or_free( p_bridge->pp_es,
+        p_bridge->pp_es = xrealloc( p_bridge->pp_es,
                           (p_bridge->i_es_num + 1) * sizeof(bridged_es_t *) );
-        assert( p_bridge->pp_es );
         p_bridge->i_es_num++;
-        p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) );
-        assert( p_bridge->pp_es[i] );
+        p_bridge->pp_es[i] = xmalloc( sizeof(bridged_es_t) );
     }
 
     p_sys->p_es = p_es = p_bridge->pp_es[i];
@@ -397,7 +392,8 @@ static int OpenIn( vlc_object_t *p_this )
     vlc_value_t val;
 
     p_sys          = malloc( sizeof( in_sout_stream_sys_t ) );
-    assert( p_sys );
+    if( unlikely( !p_sys ) )
+        return VLC_ENOMEM;
 
     p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
     if( !p_sys->p_out )