[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20100502-2-1-g5223039

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5223039109c775065e9ca56b3f37e57e397dc907
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 13 08:23:39 2010 +0200

    Fix rtsp vulnerability. Patch applied by DSA. Closes: #581245

diff --git a/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch b/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch
new file mode 100644
index 0000000..ff28f6f
--- /dev/null
+++ b/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch
@@ -0,0 +1,17 @@
+From: <devin at debian.org>
+Subject: Patch for integer underflow in RTSP streaming code, taken from upstream 
+X-Upstream: commit 29447
+
+diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
+index 6539930..2e550ac 100644
+--- a/stream/realrtsp/real.c
++++ b/stream/realrtsp/real.c
+@@ -388,6 +388,8 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, char **buffer, int rdt_rawdata) {
+     return (n <= 0) ? 0 : n;
+   }
+   rmff_dump_pheader(&ph, *buffer);
++  if (size < 12)
++    return 0;
+   size-=12;
+   n=rtsp_read_data(rtsp_session, (*buffer)+12, size);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fd0f501..09f25e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
+20upstream-rtsp-underflow-fix-r29447.patch
 60_backport_x264_wrapper.patch

-- 
mplayer packaging