[vlc-commits] commit: RTMP: totally broken, disabled for the time being ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  7 21:26:56 2010 +0200| [0b0cefa3be9fcc04c6a53fa2bbfedd462437c2ed] | committer: Rémi Denis-Courmont 

RTMP: totally broken, disabled for the time being

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=0b0cefa3be9fcc04c6a53fa2bbfedd462437c2ed
---

 NEWS                               |    4 ++++
 modules/access/Modules.am          |    3 ++-
 modules/access/rtmp/rtmp_amf_flv.c |    1 +
 modules/access_output/Modules.am   |    2 ++
 4 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 155761d..04d524f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Changes between 1.0.5 and 1.0.6:
 --------------------------------
 
+Removed modules:
+ * RTMP input and output - due to security issues
+   (VLC 1.1.0 will provide a replacement using FFmpeg)
+
 
 Changes between 1.0.4 and 1.0.5:
 --------------------------------
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 8c46535..26e342d 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -60,5 +60,6 @@ libvlc_LTLIBRARIES += \
 	libaccess_http_plugin.la \
 	libaccess_ftp_plugin.la \
 	libaccess_fake_plugin.la \
-	libaccess_rtmp_plugin.la \
 	$(NULL)
+EXTRA_LTLIBRARIES += \
+	libaccess_rtmp_plugin.la
diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index acdf9a3..92c159f 100644
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -2296,6 +2296,7 @@ amf_decode_string( uint8_t **buffer )
     length = ntoh16( *(uint16_t *) *buffer );
     *buffer += sizeof( uint16_t );
 
+#error This size is wrong and breaks just about everything.
     if( length > sizeof( *buffer ) / sizeof( uint8_t ))
         return NULL;
 
diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am
index 2163d75..de6c5b5 100644
--- a/modules/access_output/Modules.am
+++ b/modules/access_output/Modules.am
@@ -18,5 +18,7 @@ libvlc_LTLIBRARIES += \
 	libaccess_output_file_plugin.la \
 	libaccess_output_udp_plugin.la \
 	libaccess_output_http_plugin.la \
+	$(NULL)
+EXTRA_LTLIBRARIES += \
 	libaccess_output_rtmp_plugin.la \
 	$(NULL)