diff --git a/CVE-2018-19840.patch b/CVE-2018-19840.patch deleted file mode 100644 index 2da0220258613462e70e2db977b5e8d20b81f61b..0000000000000000000000000000000000000000 --- a/CVE-2018-19840.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 070ef6f138956d9ea9612e69586152339dbefe51 Mon Sep 17 00:00:00 2001 -From: David Bryant -Date: Thu, 29 Nov 2018 21:00:42 -0800 -Subject: [PATCH] issue #53: error out on zero sample rate - ---- - src/pack_utils.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/pack_utils.c b/src/pack_utils.c -index 2253f0d..2a83497 100644 ---- a/src/pack_utils.c -+++ b/src/pack_utils.c -@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 - int num_chans = config->num_channels; - int i; - -+ if (!config->sample_rate) { -+ strcpy (wpc->error_message, "sample rate cannot be zero!"); -+ return FALSE; -+ } -+ - wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; - - if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/CVE-2018-19841.patch b/CVE-2018-19841.patch deleted file mode 100644 index 6872ed91e4cb10ec2b65e8de07de4523ad9a9a8f..0000000000000000000000000000000000000000 --- a/CVE-2018-19841.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bba5389dc598a92bdf2b297c3ea34620b6679b5b Mon Sep 17 00:00:00 2001 -From: David Bryant -Date: Thu, 29 Nov 2018 21:53:51 -0800 -Subject: [PATCH] issue #54: fix potential out-of-bounds heap read - ---- - src/open_utils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/open_utils.c b/src/open_utils.c -index 80051fc..4fe0d67 100644 ---- a/src/open_utils.c -+++ b/src/open_utils.c -@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) - #endif - - if (meta_bc == 4) { -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) - return FALSE; - } - else { - csum ^= csum >> 16; - -- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) -+ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) - return FALSE; - } - diff --git a/fix-memory-leak-on-opening-corrupted-files.patch b/fix-memory-leak-on-opening-corrupted-files.patch deleted file mode 100644 index 2f95ee21f0188a81cc342070f1b3898ce8c71594..0000000000000000000000000000000000000000 --- a/fix-memory-leak-on-opening-corrupted-files.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit cba2f967ebcc7e15d0f33e4219a1e04e2a6fc41e -Author: David Bryant -Date: Sun Dec 8 12:06:19 2019 -0800 - - fix possible memory leak on opening corrupted files - -diff --git a/src/open_utils.c b/src/open_utils.c -index 170c6eb..dfb7cf6 100644 ---- a/src/open_utils.c -+++ b/src/open_utils.c -@@ -177,6 +177,11 @@ WavpackContext *WavpackOpenFileInputEx64 (WavpackStreamReader64 *reader, void *w - return WavpackCloseFile (wpc); - } - -+ if (!wps->wphdr.block_samples) { // free blockbuff if we're going to loop again -+ free (wps->blockbuff); -+ wps->blockbuff = NULL; -+ } -+ - wps->init_done = TRUE; - } diff --git a/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch b/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch deleted file mode 100644 index e58eea35fe268345a63c1fcc463cde5e08733fe9..0000000000000000000000000000000000000000 --- a/wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: David Bryant -Date: Sun, 4 Feb 2018 11:28:15 -0800 -Subject: [PATCH] issue #27, do not overwrite stack on corrupt RF64 file - - -diff --git a/cli/riff.c b/cli/riff.c -index 8b1af45..de98c1e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -42,6 +42,7 @@ typedef struct { - - #pragma pack(pop) - -+#define CS64ChunkFormat "4D" - #define DS64ChunkFormat "DDDL" - - #define WAVPACK_NO_ERROR 0 -@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - if (!strncmp (chunk_header.ckID, "ds64", 4)) { - if (chunk_header.ckSize < sizeof (DS64Chunk) || -- !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) || -- bcount != chunk_header.ckSize) { -+ !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) || -+ bcount != sizeof (DS64Chunk)) { - error_line ("%s is not a valid .WAV file!", infilename); - return WAVPACK_SOFT_ERROR; - } - else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) && -- !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) { -+ !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) { - error_line ("%s", WavpackGetErrorMessage (wpc)); - return WAVPACK_SOFT_ERROR; - } -@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - - int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode) - { -- int do_rf64 = 0, write_junk = 1; -+ int do_rf64 = 0, write_junk = 1, table_length = 0; - ChunkHeader ds64hdr, datahdr, fmthdr; - RiffChunkHeader riffhdr; - DS64Chunk ds64_chunk; -+ CS64Chunk cs64_chunk; - JunkChunk junkchunk; - WaveHeader wavhdr; - uint32_t bcount; -@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType)); - total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1); - if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk); -+ total_riff_bytes += table_length * sizeof (CS64Chunk); - if (write_junk) total_riff_bytes += sizeof (junkchunk); - strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID)); - strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID)); -@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (do_rf64) { - strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID)); -- ds64hdr.ckSize = sizeof (ds64_chunk); -+ ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk)); - CLEAR (ds64_chunk); - ds64_chunk.riffSize64 = total_riff_bytes; - ds64_chunk.dataSize64 = total_data_bytes; - ds64_chunk.sampleCount64 = total_samples; -+ ds64_chunk.tableLength = table_length; - riffhdr.ckSize = (uint32_t) -1; - datahdr.ckSize = (uint32_t) -1; - WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat); -@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - datahdr.ckSize = (uint32_t) total_data_bytes; - } - -+ // this "table" is just a dummy placeholder for testing (normally not written) -+ -+ if (table_length) { -+ strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID)); -+ cs64_chunk.chunkSize64 = 12345678; -+ WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat); -+ } -+ - // write the RIFF chunks up to just before the data starts - - WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat); -@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, - - if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) || - (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) || -- (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) || -- (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || -+ (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ // again, this is normally not written except for testing -+ -+ while (table_length--) -+ if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) { -+ error_line ("can't write .WAV data, disk probably full!"); -+ return FALSE; -+ } -+ -+ -+ if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) || - !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) || - !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize || - !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) { diff --git a/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch b/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch deleted file mode 100644 index cba8f3cd6b154b09eefc78eba95822d4ae56fae0..0000000000000000000000000000000000000000 --- a/wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: David Bryant -Date: Sat, 10 Feb 2018 16:01:39 -0800 -Subject: [PATCH] issue #28, do not overwrite heap on corrupt DSDIFF file - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 410dc1c..c016df9 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - error_line ("dsdiff file version = 0x%08x", version); - } - else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) { -- char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); -+ char *prop_chunk; -+ -+ if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize); -+ -+ prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize); - - if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) || - bcount != dff_chunk_header.ckDataSize) { diff --git a/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch b/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch deleted file mode 100644 index 0e182f6499eeaca922d311c61abb7cc33384c322..0000000000000000000000000000000000000000 --- a/wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: David Bryant -Date: Sun, 11 Feb 2018 16:37:47 -0800 -Subject: [PATCH] issue #28, fix buffer overflows and bad allocs on corrupt CAF - files - - -diff --git a/cli/caff.c b/cli/caff.c -index ae57c4b..6248a71 100644 ---- a/cli/caff.c -+++ b/cli/caff.c -@@ -89,8 +89,8 @@ typedef struct - - #define CAFChannelDescriptionFormat "LLLLL" - --static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 }; --static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 }; -+static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 }; -+static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 }; - - static struct { - uint32_t mChannelLayoutTag; // Core Audio layout, 100 - 146 in high word, num channels in low word -@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - } - else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) { -- CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ CAFChannelLayout *caf_channel_layout; - -- if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || -- !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || -+ if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) { -+ error_line ("this .CAF file has an invalid 'chan' chunk!"); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ if (debug_logging_mode) -+ error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize); -+ -+ caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize); -+ -+ if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) || - bcount != caf_chunk_header.mChunkSize) { - error_line ("%s is not a valid .CAF file!", infilename); - free (caf_channel_layout); -@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - else { // just copy unknown chunks to output file - -- int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -- char *buff = malloc (bytes_to_copy); -+ uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize; -+ char *buff; -+ -+ if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) { -+ error_line ("%s is not a valid .CAF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", diff --git a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch deleted file mode 100644 index 421ef504a48321edb0ab0e7bb00a0a2b3c685e3a..0000000000000000000000000000000000000000 --- a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001 -From: David Bryant -Date: Tue, 24 Apr 2018 17:27:01 -0700 -Subject: [PATCH 1/2] issue #33, sanitize size of unknown chunks before - malloc() - ---- - cli/dsdiff.c | 9 ++++++++- - cli/riff.c | 9 ++++++++- - cli/wave64.c | 9 ++++++++- - 3 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index c016df9..fa56bbb 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - else { // just copy unknown chunks to output file - - int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1); -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/riff.c b/cli/riff.c -index de98c1e..7bddf63 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else { // just copy unknown chunks to output file - - int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", -diff --git a/cli/wave64.c b/cli/wave64.c -index 591d640..fa928a0 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - else { // just copy unknown chunks to output file - int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L; -- char *buff = malloc (bytes_to_copy); -+ char *buff; -+ -+ if (bytes_to_copy < 0 || bytes_to_copy > 4194304) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ -+ buff = malloc (bytes_to_copy); - - if (debug_logging_mode) - error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes", --- -2.14.3 - diff --git a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch deleted file mode 100644 index 1bd1d2f06964c75d98c2c823b00579fce53bacf5..0000000000000000000000000000000000000000 --- a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001 -From: David Bryant -Date: Tue, 24 Apr 2018 22:18:07 -0700 -Subject: [PATCH 2/2] issue #30 issue #31 issue #32: no multiple format chunks - in WAV or W64 - ---- - cli/riff.c | 7 ++++++- - cli/wave64.c | 6 ++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/cli/riff.c b/cli/riff.c -index 7bddf63..5d6452e 100644 ---- a/cli/riff.c -+++ b/cli/riff.c -@@ -53,7 +53,7 @@ extern int debug_logging_mode; - - int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) - { -- int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0; -+ int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0; - int64_t total_samples = 0, infilesize; - RiffChunkHeader riff_chunk_header; - ChunkHeader chunk_header; -@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else if (!strncmp (chunk_header.ckID, "fmt ", 4)) { // if it's the format chunk, we want to get some info out of there and - int supported = TRUE, format; // make sure it's a .wav file we can handle - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .WAV file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || - !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) || - bcount != chunk_header.ckSize) { -diff --git a/cli/wave64.c b/cli/wave64.c -index fa928a0..0388dc7 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - Wave64ChunkHeader chunk_header; - Wave64FileHeader filehdr; - WaveHeader WaveHeader; -+ int format_chunk = 0; - uint32_t bcount; - - infilesize = DoGetFileSize (infile); -@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) { - int supported = TRUE, format; - -+ if (format_chunk++) { -+ error_line ("%s is not a valid .W64 file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L; - - if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) || --- -2.14.3 - diff --git a/wavpack-5.1.0.tar.bz2 b/wavpack-5.1.0.tar.bz2 deleted file mode 100644 index f66ee613e204c4123b47e7f9235bc0a0be63e530..0000000000000000000000000000000000000000 Binary files a/wavpack-5.1.0.tar.bz2 and /dev/null differ diff --git a/wavpack-5.3.0.tar.xz b/wavpack-5.3.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c231025811014445c5365b636f2a14481ca7d897 Binary files /dev/null and b/wavpack-5.3.0.tar.xz differ diff --git a/wavpack-CVE-2019-11498.patch b/wavpack-CVE-2019-11498.patch deleted file mode 100644 index e8a27088d0a80e88023f87161791b77b96121067..0000000000000000000000000000000000000000 --- a/wavpack-CVE-2019-11498.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bc6cba3f552c44565f7f1e66dc1580189addb2b4 Mon Sep 17 00:00:00 2001 -From: David Bryant -Date: Tue, 5 Mar 2019 21:32:27 -0800 -Subject: [PATCH] issue #67: make sure sample rate is specified and non-zero in - DFF files - ---- - cli/dsdiff.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index f357181..193adee 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -171,7 +171,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - if (!strncmp (prop_chunk, "SND ", 4)) { - char *cptr = prop_chunk + 4, *eptr = prop_chunk + dff_chunk_header.ckDataSize; - uint16_t numChannels, chansSpecified, chanMask = 0; -- uint32_t sampleRate; -+ uint32_t sampleRate = 0; - - while (eptr - cptr >= sizeof (dff_chunk_header)) { - memcpy (&dff_chunk_header, cptr, sizeof (dff_chunk_header)); -@@ -263,6 +263,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - free (prop_chunk); - } - else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { -+ -+ if (!config->num_channels || !config->sample_rate) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - total_samples = dff_chunk_header.ckDataSize / config->num_channels; - break; - } diff --git a/wavpack.spec b/wavpack.spec index fc285b01792047a950480e151b0fd360622e8361..c60874945cb998acd02d1a8ea21980247798cb57 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,24 +1,15 @@ Name: wavpack -Version: 5.1.0 -Release: 12 +Version: 5.3.0 +Release: 1 Summary: Hybrid Lossless Wavefile Compressor License: BSD Url: http://www.wavpack.com/ -Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch0000: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch -Patch0001: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch -Patch0002: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch -Patch0003: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch -Patch0004: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch -# fix potential out-of-bounds heapo read -Patch0005: wavpack-CVE-2019-11498.patch -# make sure sample rate is specified and non-zero in DFF files -Patch0006: CVE-2018-19841.patch -Patch0007: fix-memory-leak-on-opening-corrupted-files.patch -Patch6000: CVE-2018-19840.patch +Source: https://github.com/dbry/WavPack/releases/download/%{version}/%{name}-%{version}.tar.xz BuildRequires: autoconf automake libtool +Recommends: %{name}-help = %{version}-%{release} + %description WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode. For version 5.0.0, several new file formats @@ -59,12 +50,13 @@ autoreconf -ivf /sbin/ldconfig %files -%doc AUTHORS COPYING +%doc AUTHORS doc/wavpack_doc.html +%license COPYING %{_bindir}/* %{_libdir}/libwavpack.so.* %files devel -%doc ChangeLog README +%doc ChangeLog doc/*.pdf %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/*.so @@ -73,6 +65,10 @@ autoreconf -ivf %{_mandir}/man1/*.1* %changelog +* Sat Nov 28 2020 lingsheng - 5.3.0-1 +- Update to 5.3.0 +- Fix OSS-Fuzz issue 19925 19928 20060 20448 + * Sat May 14 2020 lutianxiong - 5.1.0-12 - Type:bugfix - ID:NA