Rebase to 5.5.0

Resolves: rhbz#2105686
This commit is contained in:
Tomas Korbar 2022-07-13 12:51:15 +02:00
parent 89b10b6537
commit 5f0f312699
3 changed files with 12 additions and 40 deletions

View File

@ -1 +1 @@
SHA512 (wavpack-5.4.0.tar.bz2) = 6575c63c9309023ad4bd1711e2d7684ac6a5b61879514342b79f04453d7495e59592dc08d3de4d4cc6c64d6bdf56e361587d425f21fac084cb441fb70d83b6d8
SHA512 (wavpack-5.5.0.tar.bz2) = bf2b32c90850f1adaddb92b4996371b5cdb1a366bfed9967c39215dec4a7cc1a0474352db72e699f3eed32451a6c1ff33221457330577a403a73e4158297c68e

View File

@ -1,34 +0,0 @@
From: David Bryant <david@wavpack.com>
Date: Tue, 23 Nov 2021 13:14:35 -0800
Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths
diff --git a/cli/dsdiff.c b/cli/dsdiff.c
index d7adb6a..5bdcae3 100644
--- a/cli/dsdiff.c
+++ b/cli/dsdiff.c
@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
}
total_samples = dff_chunk_header.ckDataSize / config->num_channels;
+
+ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) {
+ error_line ("%s is not a valid .DFF file!", infilename);
+ return WAVPACK_SOFT_ERROR;
+ }
+
break;
}
else { // just copy unknown chunks to output file
diff --git a/cli/dsf.c b/cli/dsf.c
index e1d7973..dddd488 100644
--- a/cli/dsf.c
+++ b/cli/dsf.c
@@ -113,6 +113,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.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 ||
(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) {

View File

@ -1,16 +1,16 @@
Name: wavpack
Summary: A completely open audiocodec
Version: 5.4.0
Release: 5%{?dist}
Version: 5.5.0
Release: 1%{?dist}
License: BSD
Url: http://www.wavpack.com/
Source: http://www.wavpack.com/%{name}-%{version}.tar.bz2
Patch1: wavpack-0001-issue-110-sanitize-DSD-file-types-for-invalid-length.patch
# For autoreconf
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: make
BuildRequires: gettext-devel
%description
WavPack is a completely open audio compression format providing lossless,
@ -37,7 +37,7 @@ autoreconf -ivf
# for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7
# architecture will fail.
# http://lists.busybox.net/pipermail/buildroot/2015-October/142117.html
%configure --disable-static \
%configure --disable-static --disable-rpath \
%ifarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl
--disable-asm \
%endif
@ -47,6 +47,8 @@ make %{?_smp_mflags}
%install
%make_install
rm -f %{buildroot}/%{_libdir}/*.la
# we will install the documentation ourselves through the %doc macro
rm -rf %{buildroot}/%{_docdir}/
%ldconfig_scriptlets
@ -57,7 +59,7 @@ rm -f %{buildroot}/%{_libdir}/*.la
%{_mandir}/man1/wvgain.1*
%{_mandir}/man1/wvunpack.1*
%{_mandir}/man1/wvtag.1*
%doc AUTHORS doc/wavpack_doc.html
%doc AUTHORS doc/wavpack_doc.html doc/style.css
%license COPYING
%files devel
@ -67,6 +69,10 @@ rm -f %{buildroot}/%{_libdir}/*.la
%doc ChangeLog doc/WavPack5PortingGuide.pdf doc/WavPack5LibraryDoc.pdf doc/WavPack5FileFormat.pdf
%changelog
* Wed Jul 13 2022 Tomas Korbar <tkorbar@redhat.com> - 5.5.0-1
- Rebase to 5.5.0
- Resolves: rhbz#2105686
* Wed Apr 6 2022 Peter Lemenkov <lemenkov@gmail.com> - 5.4.0-5
- Fix for CVE-2021-44269