From 0efd7c4daf909f81952f74ff178da566b8127b0b Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Jan 09 2020 14:10:40 +0000 Subject: Update to 5.2.0 Resolves: rhbz#1785008 --- diff --git a/sources b/sources index 98d5eff..09c3a23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wavpack-5.1.0.tar.bz2) = 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 +SHA512 (wavpack-5.2.0.tar.bz2) = 456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 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 e58eea3..0000000 --- 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 cba8f3c..0000000 --- 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 0e182f6..0000000 --- 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 52fc237..0000000 --- a/wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: David Bryant -Date: Tue, 24 Apr 2018 17:27:01 -0700 -Subject: [PATCH] issue #33, sanitize size of unknown chunks before malloc() - - -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", 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 b1f4afd..0000000 --- a/wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: David Bryant -Date: Tue, 24 Apr 2018 22:18:07 -0700 -Subject: [PATCH] issue #30 issue #31 issue #32: no multiple format chunks in - WAV or W64 - - -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) || diff --git a/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch b/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch deleted file mode 100644 index 0dd06d6..0000000 --- a/wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: David Bryant -Date: Thu, 29 Nov 2018 21:00:42 -0800 -Subject: [PATCH] issue #53: error out on zero sample rate - - -diff --git a/src/pack_utils.c b/src/pack_utils.c -index 1918c18..ee3debf 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/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch b/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch deleted file mode 100644 index a915641..0000000 --- a/wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: David Bryant -Date: Thu, 29 Nov 2018 21:53:51 -0800 -Subject: [PATCH] issue #54: fix potential out-of-bounds heap read - - -diff --git a/src/open_utils.c b/src/open_utils.c -index fc9440c..ce0879c 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/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch b/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch deleted file mode 100644 index 03fc32c..0000000 --- a/wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: David Bryant -Date: Sun, 26 Aug 2018 20:24:00 -0700 -Subject: [PATCH] issue #41: make sure DFF chunk does not have negative length - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index fa56bbb..c65aed3 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -188,7 +188,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - cptr += sizeof (dff_chunk_header); - WavpackBigEndianToNative (&dff_chunk_header, DFFChunkHeaderFormat); - -- if (eptr - cptr >= dff_chunk_header.ckDataSize) { -+ if (dff_chunk_header.ckDataSize > 0 && dff_chunk_header.ckDataSize <= eptr - cptr) { - if (!strncmp (dff_chunk_header.ckID, "FS ", 4) && dff_chunk_header.ckDataSize == 4) { - memcpy (&sampleRate, cptr, sizeof (sampleRate)); - WavpackBigEndianToNative (&sampleRate, "L"); diff --git a/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch b/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch deleted file mode 100644 index 02025ae..0000000 --- a/wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: David Bryant -Date: Sun, 26 Aug 2018 21:25:38 -0700 -Subject: [PATCH] issue #43: catch zero channel count in DSF and DSDIFF files - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index c65aed3..738a46b 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -204,6 +204,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - - chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; - -+ if (numChannels < chansSpecified || numChannels < 1) { -+ error_line ("%s is not a valid .DFF file!", infilename); -+ free (prop_chunk); -+ return WAVPACK_SOFT_ERROR; -+ } -+ - while (chansSpecified--) { - if (!strncmp (cptr, "SLFT", 4) || !strncmp (cptr, "MLFT", 4)) - chanMask |= 0x1; -diff --git a/cli/dsf.c b/cli/dsf.c -index cd82ae9..d12e409 100644 ---- a/cli/dsf.c -+++ b/cli/dsf.c -@@ -122,6 +122,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC - if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || - format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || - (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || -+ format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || - format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { - error_line ("%s is not a valid .DSF file!", infilename); - return WAVPACK_SOFT_ERROR; diff --git a/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch b/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch deleted file mode 100644 index 0ab6843..0000000 --- a/wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: David Bryant -Date: Sat, 2 Mar 2019 18:37:14 -0800 -Subject: [PATCH] issue #65: make sure DSDIFF files have a valid channel count - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 738a46b..1d637d7 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -180,7 +180,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; -+ uint16_t numChannels = 0, chansSpecified, chanMask = 0; - uint32_t sampleRate; - - while (eptr - cptr >= sizeof (dff_chunk_header)) { -@@ -204,7 +204,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - - chansSpecified = (int)(dff_chunk_header.ckDataSize - sizeof (numChannels)) / 4; - -- if (numChannels < chansSpecified || numChannels < 1) { -+ if (numChannels < chansSpecified || numChannels < 1 || numChannels > 256) { - error_line ("%s is not a valid .DFF file!", infilename); - free (prop_chunk); - return WAVPACK_SOFT_ERROR; -@@ -279,6 +279,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) { -+ 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-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch b/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch deleted file mode 100644 index ee1197d..0000000 --- a/wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - - -diff --git a/cli/dsdiff.c b/cli/dsdiff.c -index 1d637d7..32d276c 100644 ---- a/cli/dsdiff.c -+++ b/cli/dsdiff.c -@@ -181,7 +181,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 = 0, 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)); -@@ -280,7 +280,7 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - } - else if (!strncmp (dff_chunk_header.ckID, "DSD ", 4)) { - -- if (!config->num_channels) { -+ if (!config->num_channels || !config->sample_rate) { - error_line ("%s is not a valid .DFF file!", infilename); - return WAVPACK_SOFT_ERROR; - } diff --git a/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch b/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch deleted file mode 100644 index dc4206a..0000000 --- a/wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cli/wave64.c b/cli/wave64.c -index 7beffe6..59548b1 100644 ---- a/cli/wave64.c -+++ b/cli/wave64.c -@@ -56,6 +56,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa - int format_chunk = 0; - uint32_t bcount; - -+ CLEAR (WaveHeader); - infilesize = DoGetFileSize (infile); - memcpy (&filehdr, fourcc, 4); - diff --git a/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch b/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch deleted file mode 100644 index 57bcaf9..0000000 --- a/wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/cli/caff.c b/cli/caff.c -index 2a5e2d9..a35da74 100644 ---- a/cli/caff.c -+++ b/cli/caff.c -@@ -152,7 +152,7 @@ static struct { - - int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config) - { -- uint32_t chan_chunk = 0, channel_layout = 0, bcount; -+ uint32_t chan_chunk = 0, desc_chunk = 0, channel_layout = 0, bcount; - unsigned char *channel_identities = NULL; - unsigned char *channel_reorder = NULL; - int64_t total_samples = 0, infilesize; -@@ -218,6 +218,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - } - - WavpackBigEndianToNative (&caf_audio_format, CAFAudioFormatFormat); -+ desc_chunk = 1; - - if (debug_logging_mode) { - char formatstr [5]; -@@ -458,7 +459,7 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack - else if (!strncmp (caf_chunk_header.mChunkType, "data", 4)) { // on the data chunk, get size and exit loop - uint32_t mEditCount; - -- if (!DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || -+ if (!desc_chunk || !DoReadFile (infile, &mEditCount, sizeof (mEditCount), &bcount) || - bcount != sizeof (mEditCount)) { - error_line ("%s is not a valid .CAF file!", infilename); - return WAVPACK_SOFT_ERROR; diff --git a/wavpack.spec b/wavpack.spec index f77fe75..d105287 100644 --- a/wavpack.spec +++ b/wavpack.spec @@ -1,23 +1,10 @@ Name: wavpack Summary: A completely open audiocodec -Version: 5.1.0 -Release: 16%{?dist} +Version: 5.2.0 +Release: 1%{?dist} License: BSD Url: http://www.wavpack.com/ Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2 -Patch1: wavpack-0001-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch -Patch2: wavpack-0002-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch -Patch3: wavpack-0003-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch -Patch4: wavpack-0004-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch -Patch5: wavpack-0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch -Patch6: wavpack-0006-issue-53-error-out-on-zero-sample-rate.patch -Patch7: wavpack-0007-issue-54-fix-potential-out-of-bounds-heap-read.patch -Patch8: wavpack-0008-issue-41-make-sure-DFF-chunk-does-not-have-negative-.patch -Patch9: wavpack-0009-issue-43-catch-zero-channel-count-in-DSF-and-DSDIFF-.patch -Patch10: wavpack-0010-issue-65-make-sure-DSDIFF-files-have-a-valid-channel.patch -Patch11: wavpack-0011-issue-67-make-sure-sample-rate-is-specified-and-non-.patch -Patch12: wavpack-0012-issue-68-clear-WaveHeader-at-start-to-prevent-uninit.patch -Patch13: wavpack-0013-issue-66-make-sure-CAF-files-have-a-desc-chunk.patch # For autoreconf BuildRequires: autoconf BuildRequires: automake @@ -68,16 +55,19 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_mandir}/man1/wvgain.1* %{_mandir}/man1/wvunpack.1* %{_mandir}/man1/wvtag.1* -%doc AUTHORS +%doc AUTHORS doc/wavpack_doc.html %license COPYING %files devel %{_includedir}/* %{_libdir}/pkgconfig/* %{_libdir}/libwavpack.so -%doc ChangeLog README +%doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf %changelog +* Thu Jan 09 2020 Tomas Korbar - 5.2.0-1 +- Update to 5.2.0 + * Mon Aug 19 2019 Tomas Korbar - 5.1.0-16 - Fix for CVE-2019-1010317