Fix memleaks (corner case).

[vlc] / modules / stream_out / rtsp.c

diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 159bedb92a76bcd59112d7ffed72b8d74ec8e319..30e35526bc87da2150294ab9287a93cafb915265 100644 (file)
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 
 #include <vlc_httpd.h>
@@ -84,7 +84,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
     rtsp->host = NULL;
     rtsp->url = NULL;
     rtsp->psz_path = NULL;
-    vlc_mutex_init( p_stream, &rtsp->lock );
+    vlc_mutex_init( &rtsp->lock );
 
     rtsp->port = (url->i_port > 0) ? url->i_port : 554;
     rtsp->psz_path = strdup( ( url->psz_path != NULL ) ? url->psz_path : "/" );
@@ -138,6 +138,8 @@ void RtspUnsetup( rtsp_stream_t *rtsp )
 
     free( rtsp->psz_path );
     vlc_mutex_destroy( &rtsp->lock );
+
+    free( rtsp );
 }
 
 
@@ -348,6 +350,9 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     const char *psz_session = NULL, *psz;
     char control[sizeof("rtsp://[]:12345") + NI_MAXNUMERICHOST
                   + strlen( rtsp->psz_path )];
+    time_t now;
+
+    time (&now);
 
     if( answer == NULL || query == NULL || cl == NULL )
         return VLC_SUCCESS;
@@ -376,6 +381,22 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     answer->i_body = 0;
     answer->p_body = NULL;
 
+    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
+
+    /* Date: is always allowed, and sometimes mandatory with RTSP/2.0. */
+    struct tm ut;
+    if (gmtime_r (&now, &ut) != NULL)
+    {   /* RFC1123 format, GMT is mandatory */
+        static const char wdays[7][4] = {
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+        static const char mons[12][4] = {
+            "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+            "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+        httpd_MsgAdd (answer, "Date", "%s, %02u %s %04u %02u:%02u:%02u GMT",
+                      wdays[ut.tm_wday], ut.tm_mday, mons[ut.tm_mon],
+                      1900 + ut.tm_year, ut.tm_hour, ut.tm_min, ut.tm_sec);
+    }
+
     if( query->i_proto != HTTPD_PROTO_RTSP )
     {
         answer->i_status = 505;
@@ -601,14 +622,13 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
             answer->i_status = 200;
 
             psz_session = httpd_MsgGet( query, "Session" );
-#if 0
-            /* FIXME: This breaks totem, mplayer and quicktime at least */
-            if( httpd_MsgGet( query, "Range" ) != NULL )
+            const char *range = httpd_MsgGet (query, "Range");
+            if (range && strncmp (range, "npt=", 4))
             {
-                answer->i_status = 456; /* cannot seek, stream not seekable */
+                answer->i_status = 501;
                 break;
             }
-#endif
+
             vlc_mutex_lock( &rtsp->lock );
             ses = RtspClientGet( rtsp, psz_session );
             if( ses != NULL )
@@ -697,7 +717,6 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
             return VLC_EGENERIC;
     }
 
-    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
     if( psz_session )
         httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );