[SCM] mplayer2/master: Bug Fix: "CVE-2011-3625: Buffer overflow in SAMI parsing"

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a933847df8f0afcf8a35a4fe7710af3dc23e5db8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 29 10:36:27 2011 +0200

    Bug Fix: "CVE-2011-3625: Buffer overflow in SAMI parsing"
    
    subreader: SAMI subs: wrap line if needed
    
    Start a new line if there's no space left to append to the previous
    one.
    
    Closes: #646937
    Thanks: Mehdi Dogguy <mehdi at debian.org> for reporting

diff --git a/debian/patches/0002-CVE-2011-3625.patch b/debian/patches/0002-CVE-2011-3625.patch
new file mode 100644
index 0000000..60932eb
--- /dev/null
+++ b/debian/patches/0002-CVE-2011-3625.patch
@@ -0,0 +1,25 @@
+From 27b88a09c5319deb62221b8cd0ecc14cd1136e4a Mon Sep 17 00:00:00 2001
+From: reimar <reimar at b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Thu, 19 May 2011 09:11:56 +0000
+Subject: subreader: SAMI subs: wrap line if needed
+
+Start a new line if there's no space left to append to the previous
+one.
+
+git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33471 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+diff --git a/sub/subreader.c b/sub/subreader.c
+index 6acecb5..a1d2974 100644
+--- a/sub/subreader.c
++++ b/sub/subreader.c
+@@ -177,6 +177,8 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current,
+ 	    break;
+ 
+ 	case 3: /* get all text until '<' appears */
++	    if (p - text >= LINE_LEN)
++	        sami_add_line(current, text, &p);
+ 	    if (*s == '\0') break;
+ 	    else if (!strncasecmp (s, "<br>", 4)) {
+                 sami_add_line(current, text, &p);
+--
+cgit v0.9
diff --git a/debian/patches/series b/debian/patches/series
index f4135b9..e139303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-new_libbluray_api.patch
+0002-CVE-2011-3625.patch

-- 
mplayer2 packaging