Don't leak every https parameters.

[vlc] / modules / access_output / http.c

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index bf44c68633a9dbbaf8d28db98bbe120405351852..fff220d4a19b88b343063083dcf9bf48fc4cd0a9 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -26,7 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
@@ -87,7 +92,7 @@ static void Close( vlc_object_t * );
 
 
 vlc_module_begin();
-    set_description( _("HTTP stream output") );
+    set_description( N_("HTTP stream output") );
     set_capability( "sout access", 0 );
     set_shortname( "HTTP" );
     add_shortcut( "http" );
@@ -96,21 +101,21 @@ vlc_module_begin();
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );
     add_string( SOUT_CFG_PREFIX "user", "", NULL,
-                USER_TEXT, USER_LONGTEXT, VLC_TRUE );
+                USER_TEXT, USER_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
-                PASS_TEXT, PASS_LONGTEXT, VLC_TRUE );
+                PASS_TEXT, PASS_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mime", "", NULL,
-                MIME_TEXT, MIME_LONGTEXT, VLC_TRUE );
+                MIME_TEXT, MIME_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
-                CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
+                CERT_TEXT, CERT_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
-                KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
+                KEY_TEXT, KEY_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
-                CA_TEXT, CA_LONGTEXT, VLC_TRUE );
+                CA_TEXT, CA_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
-                CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
-    add_bool( SOUT_CFG_PREFIX "bonjour", VLC_FALSE, NULL,
-              BONJOUR_TEXT, BONJOUR_LONGTEXT, VLC_TRUE);
+                CRL_TEXT, CRL_LONGTEXT, true );
+    add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
+              BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -118,11 +123,11 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
     "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
 };
 
-static int Write( sout_access_out_t *, block_t * );
+static ssize_t Write( sout_access_out_t *, block_t * );
 static int Seek ( sout_access_out_t *, off_t  );
 
 struct sout_access_out_sys_t
@@ -137,7 +142,7 @@ struct sout_access_out_sys_t
     int                 i_header_allocated;
     int                 i_header_size;
     uint8_t             *p_header;
-    vlc_bool_t          b_header_complete;
+    bool          b_header_complete;
 
 #ifdef HAVE_AVAHI_CLIENT
     void                *p_bonjour;
@@ -160,16 +165,13 @@ static int Open( vlc_object_t *p_this )
     char                *psz_user = NULL;
     char                *psz_pwd = NULL;
     char                *psz_mime = NULL;
-    const char          *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
+    char                *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
                         *psz_crl = NULL;
     vlc_value_t         val;
 
     if( !( p_sys = p_access->p_sys =
                 malloc( sizeof( sout_access_out_sys_t ) ) ) )
-    {
-        msg_Err( p_access, "Not enough memory" );
         return VLC_ENOMEM ;
-    }
 
     config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
@@ -239,6 +241,11 @@ static int Open( vlc_object_t *p_this )
                                             psz_bind_addr, i_bind_port,
                                             psz_cert, psz_key, psz_ca,
                                             psz_crl );
+    free( psz_cert );
+    free( psz_key );
+    free( psz_ca );
+    free( psz_crl );
+
     if( p_sys->p_httpd_host == NULL )
     {
         msg_Err( p_access, "cannot listen on %s:%d",
@@ -278,9 +285,9 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_httpd_stream =
         httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
                          psz_user, psz_pwd, NULL );
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );
-    if( psz_mime ) free( psz_mime );
+    free( psz_user );
+    free( psz_pwd );
+    free( psz_mime );
 
     if( p_sys->p_httpd_stream == NULL )
     {
@@ -304,19 +311,24 @@ static int Open( vlc_object_t *p_this )
         if( psz_name != NULL ) psz_name++;
         else psz_name = psz_newuri;
 
-        asprintf( &psz_txt, "path=%s", psz_name );
-
-        free( psz_uri );
+        if( psz_file_name &&
+            asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 )
+            {
+                pl_Release( p_access );
+                free( psz_uri );
+                return VLC_ENOMEM;
+            }
 
         p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
                                     strcmp( p_access->psz_access, "https" )
                                        ? "_vlc-http._tcp" : "_vlc-https._tcp",
                                              psz_name, i_bind_port, psz_txt );
+        free( psz_uri );
         free( (void *)psz_txt );
 
         if( p_sys->p_bonjour == NULL )
             msg_Err( p_access, "unable to start requested Bonjour announce" );
-        vlc_object_release( p_playlist );
+        pl_Release( p_access );
     }
     else
         p_sys->p_bonjour = NULL;
@@ -327,7 +339,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_header_allocated = 1024;
     p_sys->i_header_size      = 0;
     p_sys->p_header           = malloc( p_sys->i_header_allocated );
-    p_sys->b_header_complete  = VLC_FALSE;
+    p_sys->b_header_complete  = false;
 
     p_access->pf_write       = Write;
     p_access->pf_seek        = Seek;
@@ -358,7 +370,7 @@ static void Close( vlc_object_t * p_this )
     httpd_StreamDelete( p_sys->p_httpd_stream );
     httpd_HostDelete( p_sys->p_httpd_host );
 
-    FREE( p_sys->p_header );
+    free( p_sys->p_header );
 
     msg_Dbg( p_access, "Close" );
 
@@ -368,7 +380,7 @@ static void Close( vlc_object_t * p_this )
 /*****************************************************************************
  * Write:
  *****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
 {
     sout_access_out_sys_t *p_sys = p_access->p_sys;
     int i_err = 0;
@@ -385,7 +397,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
             {
                 /* free previously gathered header */
                 p_sys->i_header_size = 0;
-                p_sys->b_header_complete = VLC_FALSE;
+                p_sys->b_header_complete = false;
             }
             if( (int)(p_buffer->i_buffer + p_sys->i_header_size) >
                 p_sys->i_header_allocated )
@@ -402,7 +414,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
         }
         else if( !p_sys->b_header_complete )
         {
-            p_sys->b_header_complete = VLC_TRUE;
+            p_sys->b_header_complete = true;
 
             httpd_StreamHeader( p_sys->p_httpd_stream, p_sys->p_header,
                                 p_sys->i_header_size );