summaryrefslogtreecommitdiff
path: root/user/sox/CVE-2017-11359.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-03-22 10:34:42 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-03-22 10:34:42 +0000
commit7a8eb9c1a4a9c2f3e3a3228266bcba74ab298c23 (patch)
tree7cb10f6bfae6c18be3f8b837840bdc060505fe65 /user/sox/CVE-2017-11359.patch
parent8e8bfad331752ef7dc605c9f7c65e8271f96ddeb (diff)
parent988d22dd710713d46c13c0b08f045aa2ce4f69d9 (diff)
downloadpackages-7a8eb9c1a4a9c2f3e3a3228266bcba74ab298c23.tar.gz
packages-7a8eb9c1a4a9c2f3e3a3228266bcba74ab298c23.tar.bz2
packages-7a8eb9c1a4a9c2f3e3a3228266bcba74ab298c23.tar.xz
packages-7a8eb9c1a4a9c2f3e3a3228266bcba74ab298c23.zip
Merge branch 'cves.2020.03.16' into 'master'
CVE patches for 2020.03.16 See merge request adelie/packages!411
Diffstat (limited to 'user/sox/CVE-2017-11359.patch')
-rw-r--r--user/sox/CVE-2017-11359.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/user/sox/CVE-2017-11359.patch b/user/sox/CVE-2017-11359.patch
new file mode 100644
index 000000000..cb96c4a71
--- /dev/null
+++ b/user/sox/CVE-2017-11359.patch
@@ -0,0 +1,30 @@
+From 7b3f30e13e4845bafc93215a372c6eb7dcf04118 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 17:02:11 +0000
+Subject: [PATCH] wav: fix crash writing header when channel count >64k
+ (CVE-2017-11359)
+
+---
+ src/wav.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/wav.c b/src/wav.c
+index 71fd52ac..eca1cde5 100644
+--- a/src/wav.c
++++ b/src/wav.c
+@@ -1379,6 +1379,12 @@ static int wavwritehdr(sox_format_t * ft, int second_header)
+ long blocksWritten = 0;
+ sox_bool isExtensible = sox_false; /* WAVE_FORMAT_EXTENSIBLE? */
+
++ if (ft->signal.channels > UINT16_MAX) {
++ lsx_fail_errno(ft, SOX_EOF, "Too many channels (%u)",
++ ft->signal.channels);
++ return SOX_EOF;
++ }
++
+ dwSamplesPerSecond = ft->signal.rate;
+ wChannels = ft->signal.channels;
+ wBitsPerSample = ft->encoding.bits_per_sample;
+--
+2.25.0
+