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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 24b60951664fa380f2390b40fcef5b6dd35051f0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 14 16:04:31 2010 +0200

    Fix another integer overflow

diff --git a/debian/patches/21upstream-trsp-underflow-fix-r29455.patch b/debian/patches/21upstream-trsp-underflow-fix-r29455.patch
new file mode 100644
index 0000000..ce5a3e3
--- /dev/null
+++ b/debian/patches/21upstream-trsp-underflow-fix-r29455.patch
@@ -0,0 +1,15 @@
+From: uau
+Subject: stream/realrtsp/real.c: Fix another integer overflow
+X-Upstream: commit r29455
+
+--- trunk/stream/realrtsp/real.c	(revision 29454)
++++ trunk/stream/realrtsp/real.c	(revision 29455)
+@@ -382,6 +382,8 @@
+     ph.flags=0;
+   *buffer = xbuffer_ensure_size(*buffer, 12+size);
+   if(rdt_rawdata) {
++      if (size < 12)
++          return 0;
+     n=rtsp_read_data(rtsp_session, *buffer, size-12);
+     return (n <= 0) ? 0 : n;
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 09f25e6..773bbf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 11configure-mktemp.patch
+20upstream-rtsp-underflow-fix-r29447.patch
+21upstream-trsp-underflow-fix-r29455.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
-20upstream-rtsp-underflow-fix-r29447.patch
 60_backport_x264_wrapper.patch

-- 
mplayer packaging