Replace argument = realloc( argument, size ); with realloc_or_free() in modules/...

[vlc] / modules / access / mms / mmsh.c

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 580c5ce12d4f2c7f4f4c6af6801a98f3f4b16579..98784b21b9c461b94a6068a27ada351793557925 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -29,13 +29,16 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_access.h>
-#include "vlc_strings.h"
-#include "vlc_input.h"
+#include <vlc_strings.h>
+#include <vlc_input.h>
+#include <vlc_memory.h>
 
 #include <vlc_network.h>
-#include "vlc_url.h"
+#include <vlc_url.h>
 #include "asf.h"
 #include "buffer.h"
 
@@ -147,33 +150,26 @@ int MMSHOpen( access_t *p_access )
         ( *p_sys->url.psz_host == '\0' ) )
     {
         msg_Err( p_access, "invalid host" );
-        vlc_UrlClean( &p_sys->proxy );
-        vlc_UrlClean( &p_sys->url );
-        free( p_sys );
-        return VLC_EGENERIC;
+        goto error;
     }
     if( p_sys->url.i_port <= 0 )
         p_sys->url.i_port = 80;
 
     if( Describe( p_access, &psz_location ) )
-    {
-        vlc_UrlClean( &p_sys->proxy );
-        vlc_UrlClean( &p_sys->url );
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
+        goto error;
+
     /* Handle redirection */
     if( psz_location && *psz_location )
     {
         msg_Dbg( p_access, "redirection to %s", psz_location );
 
-        input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
+        input_thread_t * p_input = access_GetParentInput( p_access );
         input_item_t * p_new_loc;
 
         if( !p_input )
         {
             free( psz_location );
-            return VLC_EGENERIC;
+            goto error;
         }
         /** \bug we do not autodelete here */
         p_new_loc = input_item_New( p_access, psz_location, psz_location );
@@ -194,10 +190,7 @@ int MMSHOpen( access_t *p_access )
     {
         msg_Err( p_access, "cannot start stream" );
         free( p_sys->p_header );
-        vlc_UrlClean( &p_sys->proxy );
-        vlc_UrlClean( &p_sys->url );
-        free( p_sys );
-        return VLC_EGENERIC;
+        goto error;
     }
 
     if( !p_sys->b_broadcast )
@@ -206,6 +199,12 @@ int MMSHOpen( access_t *p_access )
     }
 
     return VLC_SUCCESS;
+
+error:
+    vlc_UrlClean( &p_sys->proxy );
+    vlc_UrlClean( &p_sys->url );
+    free( p_sys );
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************
@@ -217,7 +216,7 @@ void  MMSHClose ( access_t *p_access )
 
     Stop( p_access );
 
-    free( p_sys->p_header  );
+    free( p_sys->p_header );
 
     vlc_UrlClean( &p_sys->proxy );
     vlc_UrlClean( &p_sys->url );
@@ -232,7 +231,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
     access_sys_t *p_sys = p_access->p_sys;
     bool   *pb_bool;
     bool    b_bool;
-    int          *pi_int;
     int64_t      *pi_64;
     int          i_int;
 
@@ -256,11 +254,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
@@ -438,6 +431,8 @@ static int Restart( access_t *p_access )
         msg_Err( p_access, "describe failed" );
         return VLC_EGENERIC;
     }
+    free( psz_location );
+
     /* */
     if( Start( p_access, 0 ) )
     {
@@ -466,17 +461,17 @@ static int Reset( access_t *p_access )
     if( p_sys->i_header <= 0 )
         return VLC_EGENERIC;
 
-     asf_HeaderParse ( &p_sys->asfh,
-                           p_sys->p_header, p_sys->i_header );
+    asf_HeaderParse ( &p_sys->asfh,
+                       p_sys->p_header, p_sys->i_header );
     msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
              p_sys->asfh.i_data_packets_count,
              p_sys->asfh.i_min_data_packet_size );
 
-     asf_StreamSelect( &p_sys->asfh,
-                           var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                           var_CreateGetInteger( p_access, "mms-all" ),
-                           var_CreateGetInteger( p_access, "audio" ),
-                           var_CreateGetInteger( p_access, "video" ) );
+    asf_StreamSelect( &p_sys->asfh,
+                       var_CreateGetInteger( p_access, "mms-maxbitrate" ),
+                       var_CreateGetInteger( p_access, "mms-all" ),
+                       var_CreateGetInteger( p_access, "audio" ),
+                       var_CreateGetInteger( p_access, "video" ) );
 
     /* Check we have comptible asfh */
     for( i = 1; i < 128; i++ )
@@ -569,7 +564,8 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     p_sys->i_packet_used = 0;
     p_sys->i_packet_length = 0;
     p_sys->p_packet = NULL;
-     GenerateGuid ( &p_sys->guid );
+
+    GenerateGuid ( &p_sys->guid );
 
     if( OpenConnection( p_access ) )
         return VLC_EGENERIC;
@@ -590,7 +586,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     }
 
     /* Receive the http header */
-    if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ) ) == NULL )
+    if( ( psz = net_Gets( p_access, p_sys->fd, NULL ) ) == NULL )
     {
         msg_Err( p_access, "failed to read answer" );
         goto error;
@@ -681,6 +677,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
         *ppsz_location = psz_location;
         return VLC_SUCCESS;
     }
+    free( psz_location );
 
     /* Read the asf header */
     GetHeader( p_access );
@@ -698,8 +695,8 @@ static int Describe( access_t  *p_access, char **ppsz_location )
      *
      * TODO : stream bitrates properties(optional)
      *        and bitrate mutual exclusion(optional) */
-     asf_HeaderParse ( &p_sys->asfh,
-                           p_sys->p_header, p_sys->i_header );
+    asf_HeaderParse ( &p_sys->asfh,
+                       p_sys->p_header, p_sys->i_header );
     msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
              p_sys->asfh.i_data_packets_count,
              p_sys->asfh.i_min_data_packet_size );
@@ -707,11 +704,11 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     if( p_sys->asfh.i_min_data_packet_size <= 0 )
         goto error;
 
-     asf_StreamSelect( &p_sys->asfh,
-                           var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                           var_CreateGetInteger( p_access, "mms-all" ),
-                           var_CreateGetInteger( p_access, "audio" ),
-                           var_CreateGetInteger( p_access, "video" ) );
+    asf_StreamSelect( &p_sys->asfh,
+                       var_CreateGetInteger( p_access, "mms-maxbitrate" ),
+                       var_CreateGetInteger( p_access, "mms-all" ),
+                       var_CreateGetInteger( p_access, "audio" ),
+                       var_CreateGetInteger( p_access, "video" ) );
     return VLC_SUCCESS;
 
 error:
@@ -740,7 +737,8 @@ static void GetHeader( access_t *p_access )
         if( ck.i_data > 0 )
         {
             p_sys->i_header += ck.i_data;
-            p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header );
+            p_sys->p_header = realloc_or_free( p_sys->p_header, p_sys->i_header );
+            assert( p_sys->p_header );
             memcpy( &p_sys->p_header[p_sys->i_header - ck.i_data],
                     ck.p_data, ck.i_data );
         }
@@ -827,7 +825,7 @@ static int Start( access_t *p_access, int64_t i_pos )
         return VLC_EGENERIC;
     }
 
-    psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+    psz = net_Gets( p_access, p_sys->fd, NULL );
     if( psz == NULL )
     {
         msg_Err( p_access, "cannot read data 0" );