[SCM] VLC media player packaging branch, sid, updated. debian/1.0.5-1-9-g4136aa2

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 9e4cb60e9e2f5297fb7eef5e9a003193fe700961
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Mar 1 22:24:38 2010 +0000

    Fix crash on malformed rtmp stream.
    
    Patch taken from upstream
    Closes: #569151

diff --git a/debian/patches/504-rtmp-crash.patch b/debian/patches/504-rtmp-crash.patch
new file mode 100644
index 0000000..d52b58b
--- /dev/null
+++ b/debian/patches/504-rtmp-crash.patch
@@ -0,0 +1,37 @@
+commit 22ef8877c1a7df6a034febb2775be09a9a424bbf
+Author: Christophe Mutricy <xtophe at videolan.org>
+Date:   Wed Feb 10 23:31:56 2010 +0000
+
+    RTMP: Don't trust the length given by the stream
+    
+    and fix a null-dereference
+    
+    Test url: rtmp://cp31335.live.edgefcs.net/live/ (no longer crash but doesn't work)
+    (cherry picked from commit d7474341857cf8482e3037648afbe4831590fa8e)
+
+diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
+index ed3bd56..acdf9a3 100644
+--- a/modules/access/rtmp/rtmp_amf_flv.c
++++ b/modules/access/rtmp/rtmp_amf_flv.c
+@@ -1147,6 +1147,11 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
+ 
+     i++; /* Pass over AMF_DATATYPE_STRING */
+     string = amf_decode_string( &i );
++    if( !string )
++    {
++        msg_Err(p_thread,"Seriously broken stream");
++        return;
++    }
+ 
+     i++; /* Pass over AMF_DATATYPE_NUMBER */
+     number = amf_decode_number( &i );
+@@ -2291,6 +2296,9 @@ amf_decode_string( uint8_t **buffer )
+     length = ntoh16( *(uint16_t *) *buffer );
+     *buffer += sizeof( uint16_t );
+ 
++    if( length > sizeof( *buffer ) / sizeof( uint8_t ))
++        return NULL;
++
+     out = (char *) malloc( length + 1 ); /* '\0' terminated */
+     if( !out ) return NULL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f2bfcc4..82656f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 501_decrease_alsa_buffer.diff
 502_fix_typo.patch
 503_jack_input.diff
+504-rtmp-crash.patch

-- 
VLC media player packaging