diff --git a/CVE-2020-0499.patch b/CVE-2020-0499.patch deleted file mode 100644 index 53556bb..0000000 --- a/CVE-2020-0499.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2e7931c27eb15e387da440a37f12437e35b22dd4 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Mon, 7 Oct 2019 12:55:58 +1100 -Subject: [PATCH] libFLAC/bitreader.c: Fix out-of-bounds read - -Credit: Oss-Fuzz -Issue: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17069 -Testcase: fuzzer_decoder-5670265022840832 ---- - src/libFLAC/bitreader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c -index 5e4b59180e..3df4d02c0b 100644 ---- a/src/libFLAC/bitreader.c -+++ b/src/libFLAC/bitreader.c -@@ -869,7 +869,7 @@ FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[ - cwords = br->consumed_words; - words = br->words; - ucbits = FLAC__BITS_PER_WORD - br->consumed_bits; -- b = br->buffer[cwords] << br->consumed_bits; -+ b = cwords < br->capacity ? br->buffer[cwords] << br->consumed_bits : 0; - } while(cwords >= words && val < end); - } - diff --git a/CVE-2021-0561.patch b/CVE-2021-0561.patch deleted file mode 100644 index f2195ed..0000000 --- a/CVE-2021-0561.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bbcef0eb5b501083b197acb7ad84b3bc82fdc8f2 Mon Sep 17 00:00:00 2001 -From: Neelkamal Semwal -Date: Fri, 18 Dec 2020 22:28:36 +0530 -Subject: [PATCH] libFlac: Exit at EOS in verify mode - -When verify mode is enabled, once decoder flags end of stream, encode processing is considered complete ---- - src/libFLAC/stream_encoder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c -index 4c91247fe8..7109802c27 100644 ---- a/src/libFLAC/stream_encoder.c -+++ b/src/libFLAC/stream_encoder.c -@@ -2610,7 +2610,9 @@ FLAC__bool write_bitbuffer_(FLAC__StreamEncoder *encoder, uint32_t samples, FLAC - encoder->private_->verify.needs_magic_hack = true; - } - else { -- if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)) { -+ if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder) -+ || (!is_last_block -+ && (FLAC__stream_encoder_get_verify_decoder_state(encoder) == FLAC__STREAM_DECODER_END_OF_STREAM))) { - FLAC__bitwriter_release_buffer(encoder->private_->frame); - FLAC__bitwriter_clear(encoder->private_->frame); - if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) diff --git a/flac-1.3.3.tar.xz b/flac-1.3.3.tar.xz deleted file mode 100644 index beba9af..0000000 Binary files a/flac-1.3.3.tar.xz and /dev/null differ diff --git a/flac-1.3.3-sw.patch b/flac-1.3.4-sw.patch similarity index 53% rename from flac-1.3.3-sw.patch rename to flac-1.3.4-sw.patch index 4891f4d..588d97b 100755 --- a/flac-1.3.3-sw.patch +++ b/flac-1.3.4-sw.patch @@ -1,6 +1,6 @@ -diff -Nuar flac-1.3.3.org/m4/endian.m4 flac-1.3.3.sw/m4/endian.m4 ---- flac-1.3.3.org/m4/endian.m4 2022-03-03 02:53:08.140000000 +0000 -+++ flac-1.3.3.sw/m4/endian.m4 2022-03-03 02:54:44.740000000 +0000 +diff -Nuar flac-1.3.4.org/m4/endian.m4 flac-1.3.4.sw/m4/endian.m4 +--- flac-1.3.4.org/m4/endian.m4 2022-03-03 02:53:08.140000000 +0000 ++++ flac-1.3.4.sw/m4/endian.m4 2022-03-03 02:54:44.740000000 +0000 @@ -115,7 +115,7 @@ # by looking at the target CPU type. [ diff --git a/flac-1.3.4.tar.xz b/flac-1.3.4.tar.xz new file mode 100644 index 0000000..9baf217 Binary files /dev/null and b/flac-1.3.4.tar.xz differ diff --git a/flac.spec b/flac.spec index f9f4823..fbe87e2 100644 --- a/flac.spec +++ b/flac.spec @@ -1,17 +1,15 @@ %define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General) Name: flac -Version: 1.3.3 -Release: 7 +Version: 1.3.4 +Release: 1 Summary: encoder/decoder which support the Free Lossless Audio Codec License: BSD and GPLv2+ and GFDL Source0: http://downloads.xiph.org/releases/flac/flac-%{version}.tar.xz URL: http://www.xiph.org/flac/ -Patch0000: CVE-2021-0561.patch -Patch0001: CVE-2020-0499.patch %ifarch sw_64 -Patch0002: flac-1.3.3-sw.patch +Patch0000: flac-1.3.4-sw.patch %endif Provides: %{name}-libs @@ -104,6 +102,9 @@ update-desktop-database &> /dev/null || : %doc flac-doc-devel/* %changelog +* Wed Nov 9 2022 chenhaixiang - 1.3.4-1 +- update to 1.3.4 + * Wed Oct 19 2022 wuzx - 1.3.3-7 - add sw64 patch