- Order : if a then b are initialized, release b then a ;

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index fca80debbf7dbd4af2f5ffc8907d9383677a3918..108eed1f84ebb8c8e6376045fb03e81770c58df2 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -1,9 +1,8 @@
 /*****************************************************************************
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
- * FIXME : check the return value of realloc() and malloc() !
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.15 2000/12/22 13:04:45 sam Exp $
+ * $Id: input_programs.c,v 1.20 2001/01/07 04:31:18 henri Exp $
  *
  * Authors:
  *
@@ -62,7 +61,12 @@ void input_InitStream( input_thread_t * p_input, size_t i_data_len )
 
     if( i_data_len )
     {
-        p_input->stream.p_demux_data = malloc( i_data_len );
+        if ( (p_input->stream.p_demux_data = malloc( i_data_len )) == NULL )
+        {
+            intf_ErrMsg( "Unable to allocate memory in input_InitStream");
+            /* FIXME : find a way to tell if failed */
+            return;
+        }
         memset( p_input->stream.p_demux_data, 0, i_data_len );
     }
 }
@@ -127,11 +131,21 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input,
     p_input->stream.pp_programs = realloc( p_input->stream.pp_programs,
                                            p_input->stream.i_pgrm_number
                                             * sizeof(pgrm_descriptor_t *) );
-
+    if( p_input->stream.pp_programs == NULL )
+    {
+        intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
+        return( NULL );
+    }
+    
     /* Allocate the structure to store this description */
     p_input->stream.pp_programs[i_pgrm_index] =
                                         malloc( sizeof(pgrm_descriptor_t) );
-
+    if( p_input->stream.pp_programs[i_pgrm_index] == NULL )
+    {
+        intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+        return( NULL );
+    }
+    
     /* Init this entry */
     p_input->stream.pp_programs[i_pgrm_index]->i_number = i_pgrm_id;
     p_input->stream.pp_programs[i_pgrm_index]->b_is_ok = 0;
@@ -157,6 +171,11 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input,
     {
         p_input->stream.pp_programs[i_pgrm_index]->p_demux_data =
             malloc( i_data_len );
+        if( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data == NULL )
+        {
+            intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+            return( NULL );
+        }
         memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
                 i_data_len );
     }
@@ -175,7 +194,7 @@ void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
 
     ASSERT( p_pgrm );
 
-    intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_stream_id);
+    intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_number);
 
     /* Free the structures that describe the es that belongs to that program */
     for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
@@ -208,6 +227,10 @@ void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
                                            p_input->stream.i_pgrm_number
                                             * sizeof(pgrm_descriptor_t *) );
 
+    if( p_input->stream.pp_programs == NULL)
+    {
+        intf_ErrMsg( "Unable to realloc memory in input_DelProgram" );
+    }
     /* Free the description of this program */
     free( p_pgrm );
 }
@@ -243,13 +266,23 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
 {
     es_descriptor_t * p_es;
 
-    intf_DbgMsg("Adding description for ES %d", i_es_id);
+    intf_DbgMsg("Adding description for ES 0x%x", i_es_id);
 
     p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) );
+    if( p_es == NULL )
+    {
+        intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+        return( NULL);
+    }
     p_input->stream.i_es_number++;
     p_input->stream.pp_es = realloc( p_input->stream.pp_es,
                                      p_input->stream.i_es_number
                                       * sizeof(es_descriptor_t *) );
+    if( p_input->stream.pp_es == NULL )
+    {
+        intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+        return( NULL );
+    }
     p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es;
     p_es->i_id = i_es_id;
 
@@ -261,6 +294,11 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
     if( i_data_len )
     {
         p_es->p_demux_data = malloc( i_data_len );
+        if( p_es->p_demux_data == NULL )
+        {
+            intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+            return( NULL );
+        }
         memset( p_es->p_demux_data, 0, i_data_len );
     }
     else
@@ -275,6 +313,11 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
         p_pgrm->pp_es = realloc( p_pgrm->pp_es,
                                  p_pgrm->i_es_number
                                   * sizeof(es_descriptor_t *) );
+        if( p_pgrm->pp_es == NULL )
+        {
+            intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+            return( NULL );
+        }
         p_pgrm->pp_es[p_pgrm->i_es_number - 1] = p_es;
         p_es->p_pgrm = p_pgrm;
     }
@@ -317,6 +360,10 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
                 p_pgrm->pp_es = realloc( p_pgrm->pp_es,
                                          p_pgrm->i_es_number
                                           * sizeof(es_descriptor_t *));
+                if( p_pgrm->pp_es == NULL )
+                {
+                    intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+                }
                 break;
             }
         }
@@ -344,6 +391,11 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
     p_input->stream.pp_es = realloc( p_input->stream.pp_es,
                                      p_input->stream.i_es_number
                                       * sizeof(es_descriptor_t *));
+    if( p_input->stream.pp_es == NULL )
+    {
+        intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+    }
+    
 }
 
 #ifdef STATS
@@ -390,7 +442,7 @@ void input_DumpStream( input_thread_t * p_input )
 static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
                           decoder_config_t * p_config )
 {
-    p_config->i_stream_id = p_es->i_stream_id;
+    p_config->i_id = p_es->i_id;
     p_config->i_type = p_es->i_type;
     p_config->p_stream_ctrl =
         &p_input->stream.control;
@@ -426,11 +478,16 @@ static vdec_config_t * GetVdecConfig( input_thread_t * p_input,
     vdec_config_t *     p_config;
 
     p_config = (vdec_config_t *)malloc( sizeof(vdec_config_t) );
+    if( p_config == NULL )
+    {
+        intf_ErrMsg( "Unable to allocate memory in GetVdecConfig" );
+        return( NULL );
+    }
     p_config->p_vout = p_input->p_default_vout;
     if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 )
     {
         free( p_config );
-        return NULL;
+        return( NULL );
     }
 
     return( p_config );
@@ -444,12 +501,17 @@ static adec_config_t * GetAdecConfig( input_thread_t * p_input,
 {
     adec_config_t *     p_config;
 
-    p_config = (adec_config_t *)malloc( sizeof(adec_config_t) );
+    p_config = (adec_config_t *)malloc( sizeof(adec_config_t));
+    if( p_config == NULL )
+    {
+        intf_ErrMsg( "Unable to allocate memory in GetAdecConfig" );
+        return( NULL );
+    }
     p_config->p_aout = p_input->p_default_aout;
     if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 )
     {
         free( p_config );
-        return NULL;
+        return( NULL );
     }
 
     return( p_config );
@@ -470,7 +532,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
     decoder_capabilities_t  decoder;
 
 #ifdef DEBUG_INPUT
-    intf_DbgMsg( "Selecting ES %d", p_es->i_id );
+    intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
 #endif
 
     if( p_es->p_decoder_fifo != NULL )
@@ -532,6 +594,11 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
                                            p_input->stream.pp_selected_es,
                                            p_input->stream.i_selected_es_number
                                             * sizeof(es_descriptor_t *) );
+        if( p_input->stream.pp_selected_es == NULL )
+        {
+            intf_ErrMsg( "Unable to realloc memory in input_SelectES" );
+            return(-1);
+        }
         p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
                 = p_es;
     }