[SCM] libav/jessie: Patch for CVE-2016-2326

[sramacher at users.alioth.debian.org]

The following commit has been merged in the jessie branch:
commit f8d87f093a1877a914ef10010087dfd8bf65f082
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Mar 2 23:13:08 2016 +0100

    Patch for CVE-2016-2326

diff --git a/debian/patches/CVE-2016-2326.patch b/debian/patches/CVE-2016-2326.patch
new file mode 100644
index 0000000..f2eb1fa
--- /dev/null
+++ b/debian/patches/CVE-2016-2326.patch
@@ -0,0 +1,17 @@
+Description: avformat/asfenc: Check pts
+Origin: other, https://git.videolan.org/?p=ffmpeg.git;a=commit;h=7c0b84d89911b2035161f5ef51aafbfcc84aa9e2
+
+--- libav-11.6.orig/libavformat/asfenc.c
++++ libav-11.6/libavformat/asfenc.c
+@@ -847,6 +847,11 @@ static int asf_write_packet(AVFormatCont
+ 
+     pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
+     assert(pts != AV_NOPTS_VALUE);
++    if (   pts < - PREROLL_TIME
++        || pts > (INT_MAX-3)/10000LL * ASF_INDEXED_INTERVAL - PREROLL_TIME) {
++        av_log(s, AV_LOG_ERROR, "input pts %"PRId64" is invalid\n", pts);
++        return AVERROR(EINVAL);
++    }
+     duration      = pts * 10000;
+     asf->duration = FFMAX(asf->duration, duration + pkt->duration * 10000);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4d3bd8a..02762a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02-configure-disable-ebx-gcc-4.9.patch
 03-disable-configuration-warnings.patch
+CVE-2016-2326.patch

-- 
Libav/FFmpeg packaging