[SCM] sox/master: Add 0010-wavpack_check_errors.patch. (Closes: #881145)
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Nov 9 07:48:42 UTC 2017
The following commit has been merged in the master branch:
commit 6bb12e50433c313c8bf4d351cf1079229541e12e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Nov 9 08:25:55 2017 +0100
Add 0010-wavpack_check_errors.patch. (Closes: #881145)
diff --git a/debian/patches/0010-wavpack_check_errors.patch b/debian/patches/0010-wavpack_check_errors.patch
new file mode 100644
index 0000000..4ebb31c
--- /dev/null
+++ b/debian/patches/0010-wavpack_check_errors.patch
@@ -0,0 +1,35 @@
+Description: wavpack: check errors when initializing
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881145
+Author: Eric Wong <normalperson at yhbt.net>
+ Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: not-needed
+
+ src/wavpack.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/wavpack.c b/src/wavpack.c
+index 9e525cd4..b7e8dafa 100644
+--- a/src/wavpack.c
++++ b/src/wavpack.c
+@@ -65,6 +65,10 @@ static int start_read(sox_format_t * ft)
+ char msg[80];
+
+ p->codec = WavpackOpenFileInputEx(&io_fns, ft, NULL, msg, OPEN_NORMALIZE, 0);
++ if (!p->codec) {
++ lsx_fail_errno(ft, SOX_EHDR, "%s", msg);
++ return SOX_EOF;
++ }
+ ft->encoding.bits_per_sample = WavpackGetBytesPerSample(p->codec) << 3;
+ ft->signal.channels = WavpackGetNumChannels(p->codec);
+ if (WavpackGetSampleRate(p->codec) && ft->signal.rate && ft->signal.rate != WavpackGetSampleRate(p->codec))
+@@ -108,6 +112,10 @@ static int start_write(sox_format_t * ft)
+ uint64_t size64;
+
+ p->codec = WavpackOpenFileOutput(ft_write_b_buf, ft, NULL);
++ if (!p->codec) {
++ lsx_fail_errno(ft, SOX_ENOMEM, "WavPack error creating output instance");
++ return SOX_EOF;
++ }
+ memset(&config, 0, sizeof(config));
+ config.bytes_per_sample = ft->encoding.bits_per_sample >> 3;
+ config.bits_per_sample = ft->encoding.bits_per_sample;
diff --git a/debian/patches/series b/debian/patches/series
index 62aa40c..edd8e37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0007-CVE-2017-15370.patch
0008-CVE-2017-11332.patch
0009-CVE-2017-11359.patch
+0010-wavpack_check_errors.patch
--
sox packaging
More information about the pkg-multimedia-commits
mailing list