From a0f160973deac18a9c3260895c1f4a72a1f686b6 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Tue, 2 Oct 2018 12:40:13 -0300
Subject: [PATCH] libvorbis: fix CVE-2018-10392

---
 .../libvorbis/patches/CVE-2018-10392.patch    | 26 +++++++++++++++++++
 srcpkgs/libvorbis/template                    |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvorbis/patches/CVE-2018-10392.patch

diff --git a/srcpkgs/libvorbis/patches/CVE-2018-10392.patch b/srcpkgs/libvorbis/patches/CVE-2018-10392.patch
new file mode 100644
index 00000000000..1a50b6a2261
--- /dev/null
+++ b/srcpkgs/libvorbis/patches/CVE-2018-10392.patch
@@ -0,0 +1,26 @@
+From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001
+From: Thomas Daede <daede003@umn.edu>
+Date: Thu, 17 May 2018 16:19:19 -0700
+Subject: [PATCH] Sanity check number of channels in setup.
+
+Fixes #2335.
+---
+ lib/vorbisenc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
+index 4fc7b62f..64a51b5b 100644
+--- a/lib/vorbisenc.c
++++ b/lib/vorbisenc.c
+@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){
+   highlevel_encode_setup *hi=&ci->hi;
+ 
+   if(ci==NULL)return(OV_EINVAL);
++  if(vi->channels<1||vi->channels>255)return(OV_EINVAL);
+   if(!hi->impulse_block_p)i0=1;
+ 
+   /* too low/high an ATH floater is nonsensical, but doesn't break anything */
+-- 
+2.18.0
+
+
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index 5c0667f8432..01748ac8c72 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -1,7 +1,8 @@
 # Template file for 'libvorbis'.
 pkgname=libvorbis
 version=1.3.6
-revision=1
+revision=2
+patch_args="-Np1"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libogg-devel"