diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..1b49420641f6bd8729e56da08a8ed04426639f9d --- /dev/null +++ b/download @@ -0,0 +1 @@ +978087605c288fd6c0ab7c4d11e903ae libwebp-1.2.0.tar.gz diff --git a/libwebp-1.0.0.tar.gz b/libwebp-1.0.0.tar.gz deleted file mode 100644 index dd32ba8abf09100b122594aaf630e05d9d3b5ea1..0000000000000000000000000000000000000000 Binary files a/libwebp-1.0.0.tar.gz and /dev/null differ diff --git a/libwebp-freeglut.patch b/libwebp-freeglut.patch new file mode 100644 index 0000000000000000000000000000000000000000..99facf6ed5d0630d6286bed9dabc40f9f1aa3d6e --- /dev/null +++ b/libwebp-freeglut.patch @@ -0,0 +1,26 @@ +diff -rupN --no-dereference libwebp-1.2.0/CMakeLists.txt libwebp-1.2.0-new/CMakeLists.txt +--- libwebp-1.2.0/CMakeLists.txt 2021-01-21 04:43:45.000000000 +0100 ++++ libwebp-1.2.0-new/CMakeLists.txt 2021-02-01 11:37:20.760764115 +0100 +@@ -506,8 +506,8 @@ endif() + + if(WEBP_BUILD_VWEBP) + # vwebp +- find_package(GLUT) +- if(GLUT_FOUND) ++ find_package(FreeGLUT) ++ if(FreeGLUT_FOUND) + include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS}) + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp") + add_executable(vwebp ${VWEBP_SRCS}) +diff -rupN --no-dereference libwebp-1.2.0/examples/vwebp.c libwebp-1.2.0-new/examples/vwebp.c +--- libwebp-1.2.0/examples/vwebp.c 2021-01-21 04:43:45.000000000 +0100 ++++ libwebp-1.2.0-new/examples/vwebp.c 2021-02-01 11:37:20.760764115 +0100 +@@ -27,7 +27,7 @@ + #if defined(HAVE_GLUT_GLUT_H) + #include + #else +-#include ++#include + #ifdef FREEGLUT + #include + #endif diff --git a/libwebp.spec b/libwebp.spec index be33260e437ef5db0b77ce93d2b15775d1c46b6c..469354be43fd50f49f0bbfae8e3defb0cc36aa72 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,21 +1,19 @@ +%define anolis_release .0.1 %global _hardened_build 1 Name: libwebp -Version: 1.0.0 -Release: 5%{?dist} +Version: 1.2.0 +Release: 5%{anolis_release}%{?dist} URL: http://webmproject.org/ Summary: Library and tools for the WebP graphics format # Additional IPR is licensed as well. See PATENTS file for details License: BSD Source0: http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz Source1: libwebp_jni_example.java -Patch0: rhbz-1956829.patch -Patch1: rhbz-1956843.patch -Patch2: rhbz-1956919.patch -Patch3: rhbz-1956853.patch -Patch4: rhbz-1956856.patch -Patch5: rhbz-1956917.patch -Patch6: rhbz-1956868.patch +Patch0: libwebp-freeglut.patch +Patch1: mozilla-1819244.patch + +Obsoletes: libwebp7 <= 1.0.3 BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -26,6 +24,7 @@ BuildRequires: jpackage-utils BuildRequires: swig BuildRequires: autoconf automake libtool BuildRequires: freeglut-devel +BuildRequires: make %description WebP is an image format that does lossy compression of digital @@ -37,6 +36,8 @@ images more efficiently. %package tools Summary: The WebP command line tools +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: libwebp7-tools <= 1.0.3 %description tools WebP is an image format that does lossy compression of digital @@ -49,6 +50,7 @@ images more efficiently. %package devel Summary: Development files for libwebp, a library for the WebP format Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: libwebp7-devel <= 1.0.3 %description devel WebP is an image format that does lossy compression of digital @@ -83,6 +85,7 @@ export CFLAGS="%{optflags} -frename-registers" --enable-libwebpdemux --enable-libwebpdecoder \ --disable-neon %make_build V=1 +make -C examples vwebp # swig generated Java bindings cp %{SOURCE1} . @@ -147,11 +150,60 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %changelog -* Thu May 27 2021 Martin Stransky - 1.0.0-5 -- Added fixes for rhbz#1956853, rhbz#1956856, rhbz#1956868, rhbz#1956917 +* Thu May 04 2023 Weitao Zhou - 1.2.0-5.0.1 +- Obsoletes libwebp7 from remi repo for better compatibility + +* Wed Apr 26 2023 Martin Stransky - 1.2.0-5 +- Fix tools subpackage dependency + +* Wed Apr 26 2023 Martin Stransky - 1.2.0-4 +- Added fix for mzbz#1819244 + +* Mon Aug 09 2021 Mohan Boddu - 1.2.0-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 1.2.0-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Mon Feb 01 2021 Sandro Mani - 1.2.0-1 +- Update to 1.2.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.1.0-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon May 18 2020 Sandro Mani - 1.1.0-3 +- Don't manually and incorrectly install vwebp, Makefile already does it correctly (#1836640) + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 07 2020 Sandro Mani - 1.1.0-1 +- Update to 1.1.0 + +* Tue Sep 17 2019 Gwyn Ciesla - 1.0.3-3 +- Rebuilt for new freeglut + +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 15 2019 Sandro Mani - 1.0.3-1 +- Update to 1.0.3 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Sandro Mani - 1.0.2-1 +- Update to 1.0.2 -* Mon May 17 2021 Martin Stransky - 1.0.0-3 -- Added fixes for rhbz#1956829, rhbz#1956843, rhbz#1956919 +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Thu Apr 26 2018 Sandro Mani - 1.0.0-1 - Update to 1.0.0 diff --git a/mozilla-1819244.patch b/mozilla-1819244.patch new file mode 100644 index 0000000000000000000000000000000000000000..05fa0f875f279decbdbd49383f4353836bb8012c --- /dev/null +++ b/mozilla-1819244.patch @@ -0,0 +1,68 @@ + +# HG changeset patch +# User Timothy Nikkel +# Date 1678835815 0 +# Node ID 53b805c752ff23080e100eda2b3b4280d4370b2e +# Parent 8fcdaf8d685d5903b127e041feb1716637b6008f +Bug 1819244. Cherry pic webp commit fix. r=aosmond, a=dsmith + +https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129 + +Differential Revision: https://phabricator.services.mozilla.com/D171814 + +diff --git a/media/libwebp/src/enc/alpha_enc.c b/media/libwebp/src/enc/alpha_enc.c +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -8,16 +8,17 @@ + // ----------------------------------------------------------------------------- + // + // Alpha-plane compression. + // + // Author: Skal (pascal.massimino@gmail.com) + + #include + #include ++#include + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" + #include "src/utils/filters_utils.h" + #include "src/utils/quant_levels_utils.h" + #include "src/utils/utils.h" + #include "src/webp/format_constants.h" + +@@ -143,31 +144,32 @@ static int EncodeAlphaInternal(const uin + output_size = VP8LBitWriterNumBytes(&tmp_bw); + if (output_size > data_size) { + // compressed size is larger than source! Revert to uncompressed mode. + method = ALPHA_NO_COMPRESSION; + VP8LBitWriterWipeOut(&tmp_bw); + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } + + if (method == ALPHA_NO_COMPRESSION) { + output = alpha_src; + output_size = data_size; + ok = 1; + } + + // Emit final result. + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); + + if (method != ALPHA_NO_COMPRESSION) { + VP8LBitWriterWipeOut(&tmp_bw); + } + ok = ok && !result->bw.error_; + result->score = VP8BitWriterSize(&result->bw); + diff --git a/rhbz-1956829.patch b/rhbz-1956829.patch deleted file mode 100644 index 4eb544f4d8cab1ef1504a25b9a456065e9c89caf..0000000000000000000000000000000000000000 --- a/rhbz-1956829.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/dec/buffer_dec.c b/src/dec/buffer_dec.c -index 75eb3c4..3cd94eb 100644 ---- a/src/dec/buffer_dec.c -+++ b/src/dec/buffer_dec.c -@@ -74,7 +74,8 @@ - } else { // RGB checks - const WebPRGBABuffer* const buf = &buffer->u.RGBA; - const int stride = abs(buf->stride); -- const uint64_t size = MIN_BUFFER_SIZE(width, height, stride); -+ const uint64_t size = -+ MIN_BUFFER_SIZE(width * kModeBpp[mode], height, stride); - ok &= (size <= buf->size); - ok &= (stride >= width * kModeBpp[mode]); - ok &= (buf->rgba != NULL); - diff --git a/rhbz-1956843.patch b/rhbz-1956843.patch deleted file mode 100644 index e159adb25edaacd24650be66ac3280d76e4c362c..0000000000000000000000000000000000000000 --- a/rhbz-1956843.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/dec/idec_dec.c b/src/dec/idec_dec.c -index a371ed7..258d15b 100644 ---- a/src/dec/idec_dec.c -+++ b/src/dec/idec_dec.c - -@@ -283,10 +283,8 @@ - - static VP8StatusCode IDecError(WebPIDecoder* const idec, VP8StatusCode error) { - if (idec->state_ == STATE_VP8_DATA) { -- VP8Io* const io = &idec->io_; -- if (io->teardown != NULL) { -- io->teardown(io); -- } -+ // Synchronize the thread, clean-up and check for errors. -+ VP8ExitCritical((VP8Decoder*)idec->dec_, &idec->io_); - } - idec->state_ = STATE_ERROR; - return error; - diff --git a/rhbz-1956853.patch b/rhbz-1956853.patch deleted file mode 100644 index eb9e93c21486eb688d28c7b8b97b355b55ac2832..0000000000000000000000000000000000000000 --- a/rhbz-1956853.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/mux/muxread.c b/src/mux/muxread.c -index 0b55286..eb5070b 100644 ---- a/src/mux/muxread.c -+++ b/src/mux/muxread.c - -@@ -187,7 +187,7 @@ - size = bitstream->size; - - if (data == NULL) return NULL; -- if (size < RIFF_HEADER_SIZE) return NULL; -+ if (size < RIFF_HEADER_SIZE + CHUNK_HEADER_SIZE) return NULL; - if (GetLE32(data + 0) != MKFOURCC('R', 'I', 'F', 'F') || - GetLE32(data + CHUNK_HEADER_SIZE) != MKFOURCC('W', 'E', 'B', 'P')) { - return NULL; -@@ -196,8 +196,6 @@ - mux = WebPMuxNew(); - if (mux == NULL) return NULL; - -- if (size < RIFF_HEADER_SIZE + TAG_SIZE) goto Err; -- - tag = GetLE32(data + RIFF_HEADER_SIZE); - if (tag != kChunks[IDX_VP8].tag && - tag != kChunks[IDX_VP8L].tag && -@@ -206,12 +204,11 @@ - } - - riff_size = SizeWithPadding(GetLE32(data + TAG_SIZE)); -- if (riff_size > MAX_CHUNK_PAYLOAD || riff_size > size) { -- goto Err; -- } else { -- if (riff_size < size) { // Redundant data after last chunk. -- size = riff_size; // To make sure we don't read any data beyond mux_size. -- } -+ if (riff_size < CHUNK_HEADER_SIZE) goto Err; -+ if (riff_size > MAX_CHUNK_PAYLOAD || riff_size > size) goto Err; -+ // There's no point in reading past the end of the RIFF chunk. -+ if (size > riff_size + CHUNK_HEADER_SIZE) { -+ size = riff_size + CHUNK_HEADER_SIZE; - } - - end = data + size; - diff --git a/rhbz-1956856.patch b/rhbz-1956856.patch deleted file mode 100644 index f13e4b94f1484fc41b1057e7ff8bcf69e6d0e696..0000000000000000000000000000000000000000 --- a/rhbz-1956856.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/mux/muxi.h b/src/mux/muxi.h -index 6b57eea..14fd6e2 100644 ---- a/src/mux/muxi.h -+++ b/src/mux/muxi.h - -@@ -14,6 +14,7 @@ - #ifndef WEBP_MUX_MUXI_H_ - #define WEBP_MUX_MUXI_H_ - -+#include - #include - #include "src/dec/vp8i_dec.h" - #include "src/dec/vp8li_dec.h" -@@ -143,13 +144,13 @@ - - // Returns size of the chunk including chunk header and padding byte (if any). - static WEBP_INLINE size_t SizeWithPadding(size_t chunk_size) { -+ assert(chunk_size <= MAX_CHUNK_PAYLOAD); - return CHUNK_HEADER_SIZE + ((chunk_size + 1) & ~1U); - } - - // Size of a chunk including header and padding. - static WEBP_INLINE size_t ChunkDiskSize(const WebPChunk* chunk) { - const size_t data_size = chunk->data_.size; -- assert(data_size < MAX_CHUNK_PAYLOAD); - return SizeWithPadding(data_size); - } - - -diff --git a/src/mux/muxread.c b/src/mux/muxread.c -index eb5070b..ef50dae 100644 ---- a/src/mux/muxread.c -+++ b/src/mux/muxread.c - -@@ -59,6 +59,7 @@ - // Sanity checks. - if (data_size < CHUNK_HEADER_SIZE) return WEBP_MUX_NOT_ENOUGH_DATA; - chunk_size = GetLE32(data + TAG_SIZE); -+ if (chunk_size > MAX_CHUNK_PAYLOAD) return WEBP_MUX_BAD_DATA; - - { - const size_t chunk_disk_size = SizeWithPadding(chunk_size); -@@ -203,9 +204,14 @@ - goto Err; // First chunk should be VP8, VP8L or VP8X. - } - -- riff_size = SizeWithPadding(GetLE32(data + TAG_SIZE)); -+ riff_size = GetLE32(data + TAG_SIZE); -+ if (riff_size > MAX_CHUNK_PAYLOAD) goto Err; -+ -+ // Note this padding is historical and differs from demux.c which does not -+ // pad the file size. -+ riff_size = SizeWithPadding(riff_size); - if (riff_size < CHUNK_HEADER_SIZE) goto Err; -- if (riff_size > MAX_CHUNK_PAYLOAD || riff_size > size) goto Err; -+ if (riff_size > size) goto Err; - // There's no point in reading past the end of the RIFF chunk. - if (size > riff_size + CHUNK_HEADER_SIZE) { - size = riff_size + CHUNK_HEADER_SIZE; - - diff --git a/rhbz-1956868.patch b/rhbz-1956868.patch deleted file mode 100644 index ee98fca7fcd3a0ce5afcbfe4606b065bc556f45b..0000000000000000000000000000000000000000 --- a/rhbz-1956868.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff -up libwebp-1.0.0/src/dec/vp8l_dec.c.old libwebp-1.0.0/src/dec/vp8l_dec.c ---- libwebp-1.0.0/src/dec/vp8l_dec.c.old 2018-04-21 05:04:55.000000000 +0200 -+++ libwebp-1.0.0/src/dec/vp8l_dec.c 2018-11-09 00:29:51.000000000 +0100 -@@ -362,12 +362,19 @@ static int ReadHuffmanCodes(VP8LDecoder* - VP8LMetadata* const hdr = &dec->hdr_; - uint32_t* huffman_image = NULL; - HTreeGroup* htree_groups = NULL; -+ // When reading htrees, some might be unused, as the format allows it. -+ // We will still read them but put them in this htree_group_bogus. -+ HTreeGroup htree_group_bogus; - HuffmanCode* huffman_tables = NULL; -+ HuffmanCode* huffman_tables_bogus = NULL; - HuffmanCode* next = NULL; - int num_htree_groups = 1; -+ int num_htree_groups_max = 1; - int max_alphabet_size = 0; - int* code_lengths = NULL; - const int table_size = kTableSize[color_cache_bits]; -+ int* mapping = NULL; -+ int ok = 0; - - if (allow_recursion && VP8LReadBits(br, 1)) { - // use meta Huffman codes. -@@ -384,10 +391,42 @@ static int ReadHuffmanCodes(VP8LDecoder* - // The huffman data is stored in red and green bytes. - const int group = (huffman_image[i] >> 8) & 0xffff; - huffman_image[i] = group; -- if (group >= num_htree_groups) { -- num_htree_groups = group + 1; -+ if (group >= num_htree_groups_max) { -+ num_htree_groups_max = group + 1; - } - } -+ // Check the validity of num_htree_groups_max. If it seems too big, use a -+ // smaller value for later. This will prevent big memory allocations to end -+ // up with a bad bitstream anyway. -+ // The value of 1000 is totally arbitrary. We know that num_htree_groups_max -+ // is smaller than (1 << 16) and should be smaller than the number of pixels -+ // (though the format allows it to be bigger). -+ if (num_htree_groups_max > 1000 || num_htree_groups_max > xsize * ysize) { -+ // Create a mapping from the used indices to the minimal set of used -+ // values [0, num_htree_groups) -+ mapping = (int*)WebPSafeMalloc(num_htree_groups_max, sizeof(*mapping)); -+ if (mapping == NULL) { -+ dec->status_ = VP8_STATUS_OUT_OF_MEMORY; -+ goto Error; -+ } -+ // -1 means a value is unmapped, and therefore unused in the Huffman -+ // image. -+ memset(mapping, 0xff, num_htree_groups_max * sizeof(*mapping)); -+ for (num_htree_groups = 0, i = 0; i < huffman_pixs; ++i) { -+ // Get the current mapping for the group and remap the Huffman image. -+ int* const mapped_group = &mapping[huffman_image[i]]; -+ if (*mapped_group == -1) *mapped_group = num_htree_groups++; -+ huffman_image[i] = *mapped_group; -+ } -+ huffman_tables_bogus = (HuffmanCode*)WebPSafeMalloc( -+ table_size, sizeof(*huffman_tables_bogus)); -+ if (huffman_tables_bogus == NULL) { -+ dec->status_ = VP8_STATUS_OUT_OF_MEMORY; -+ goto Error; -+ } -+ } else { -+ num_htree_groups = num_htree_groups_max; -+ } - } - - if (br->eos_) goto Error; -@@ -403,11 +442,11 @@ static int ReadHuffmanCodes(VP8LDecoder* - } - } - -+ code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size, -+ sizeof(*code_lengths)); - huffman_tables = (HuffmanCode*)WebPSafeMalloc(num_htree_groups * table_size, - sizeof(*huffman_tables)); - htree_groups = VP8LHtreeGroupsNew(num_htree_groups); -- code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size, -- sizeof(*code_lengths)); - - if (htree_groups == NULL || code_lengths == NULL || huffman_tables == NULL) { - dec->status_ = VP8_STATUS_OUT_OF_MEMORY; -@@ -415,28 +454,35 @@ static int ReadHuffmanCodes(VP8LDecoder* - } - - next = huffman_tables; -- for (i = 0; i < num_htree_groups; ++i) { -- HTreeGroup* const htree_group = &htree_groups[i]; -+ for (i = 0; i < num_htree_groups_max; ++i) { -+ // If the index "i" is unused in the Huffman image, read the coefficients -+ // but store them to a bogus htree_group. -+ const int is_bogus = (mapping != NULL && mapping[i] == -1); -+ HTreeGroup* const htree_group = -+ is_bogus ? &htree_group_bogus : -+ &htree_groups[(mapping == NULL) ? i : mapping[i]]; - HuffmanCode** const htrees = htree_group->htrees; -+ HuffmanCode* huffman_tables_i = is_bogus ? huffman_tables_bogus : next; - int size; - int total_size = 0; - int is_trivial_literal = 1; - int max_bits = 0; - for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) { - int alphabet_size = kAlphabetSize[j]; -- htrees[j] = next; -+ htrees[j] = huffman_tables_i; - if (j == 0 && color_cache_bits > 0) { - alphabet_size += 1 << color_cache_bits; - } -- size = ReadHuffmanCode(alphabet_size, dec, code_lengths, next); -+ size = -+ ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_tables_i); - if (size == 0) { - goto Error; - } - if (is_trivial_literal && kLiteralMap[j] == 1) { -- is_trivial_literal = (next->bits == 0); -+ is_trivial_literal = (huffman_tables_i->bits == 0); - } -- total_size += next->bits; -- next += size; -+ total_size += huffman_tables_i->bits; -+ huffman_tables_i += size; - if (j <= ALPHA) { - int local_max_bits = code_lengths[0]; - int k; -@@ -448,38 +494,41 @@ static int ReadHuffmanCodes(VP8LDecoder* - max_bits += local_max_bits; - } - } -+ if (!is_bogus) next = huffman_tables_i; - htree_group->is_trivial_literal = is_trivial_literal; - htree_group->is_trivial_code = 0; - if (is_trivial_literal) { - const int red = htrees[RED][0].value; - const int blue = htrees[BLUE][0].value; - const int alpha = htrees[ALPHA][0].value; -- htree_group->literal_arb = -- ((uint32_t)alpha << 24) | (red << 16) | blue; -+ htree_group->literal_arb = ((uint32_t)alpha << 24) | (red << 16) | blue; - if (total_size == 0 && htrees[GREEN][0].value < NUM_LITERAL_CODES) { - htree_group->is_trivial_code = 1; - htree_group->literal_arb |= htrees[GREEN][0].value << 8; - } - } -- htree_group->use_packed_table = !htree_group->is_trivial_code && -- (max_bits < HUFFMAN_PACKED_BITS); -+ htree_group->use_packed_table = -+ !htree_group->is_trivial_code && (max_bits < HUFFMAN_PACKED_BITS); - if (htree_group->use_packed_table) BuildPackedTable(htree_group); - } -- WebPSafeFree(code_lengths); -+ ok = 1; - -- // All OK. Finalize pointers and return. -+ // All OK. Finalize pointers. - hdr->huffman_image_ = huffman_image; - hdr->num_htree_groups_ = num_htree_groups; - hdr->htree_groups_ = htree_groups; - hdr->huffman_tables_ = huffman_tables; -- return 1; - - Error: - WebPSafeFree(code_lengths); -- WebPSafeFree(huffman_image); -- WebPSafeFree(huffman_tables); -- VP8LHtreeGroupsFree(htree_groups); -- return 0; -+ WebPSafeFree(huffman_tables_bogus); -+ WebPSafeFree(mapping); -+ if (!ok) { -+ WebPSafeFree(huffman_image); -+ WebPSafeFree(huffman_tables); -+ VP8LHtreeGroupsFree(htree_groups); -+ } -+ return ok; - } - - //------------------------------------------------------------------------------ -@@ -884,7 +933,11 @@ static WEBP_INLINE void CopyBlock8b(uint - #endif - break; - case 2: -+#if !defined(WORDS_BIGENDIAN) - memcpy(&pattern, src, sizeof(uint16_t)); -+#else -+ pattern = ((uint32_t)src[0] << 8) | src[1]; -+#endif - #if defined(__arm__) || defined(_M_ARM) - pattern |= pattern << 16; - #elif defined(WEBP_USE_MIPS_DSP_R2) -@@ -1523,7 +1576,6 @@ int VP8LDecodeAlphaHeader(ALPHDecoder* c - if (dec == NULL) return 0; - - assert(alph_dec != NULL); -- alph_dec->vp8l_dec_ = dec; - - dec->width_ = alph_dec->width_; - dec->height_ = alph_dec->height_; -@@ -1555,11 +1607,12 @@ int VP8LDecodeAlphaHeader(ALPHDecoder* c - - if (!ok) goto Err; - -+ // Only set here, once we are sure it is valid (to avoid thread races). -+ alph_dec->vp8l_dec_ = dec; - return 1; - - Err: -- VP8LDelete(alph_dec->vp8l_dec_); -- alph_dec->vp8l_dec_ = NULL; -+ VP8LDelete(dec); - return 0; - } - diff --git a/rhbz-1956917.patch b/rhbz-1956917.patch deleted file mode 100644 index c9aca8700406d4140d6bfed6b9ba95283d0c7a89..0000000000000000000000000000000000000000 --- a/rhbz-1956917.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/mux/muxread.c b/src/mux/muxread.c -index fbe9f05..ea07dbf 100644 ---- a/src/mux/muxread.c -+++ b/src/mux/muxread.c - -@@ -264,6 +264,7 @@ - chunk_list = MuxGetChunkListFromId(mux, id); // List to add this chunk. - if (ChunkSetNth(&chunk, chunk_list, 0) != WEBP_MUX_OK) goto Err; - if (id == WEBP_CHUNK_VP8X) { // grab global specs -+ if (data_size < CHUNK_HEADER_SIZE + VP8X_CHUNK_SIZE) goto Err; - mux->canvas_width_ = GetLE24(data + 12) + 1; - mux->canvas_height_ = GetLE24(data + 15) + 1; - } - diff --git a/rhbz-1956919.patch b/rhbz-1956919.patch deleted file mode 100644 index 590a800271e32b7ff9946c8fa8913eebb0d98be8..0000000000000000000000000000000000000000 --- a/rhbz-1956919.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/utils/quant_levels_dec_utils.c b/src/utils/quant_levels_dec_utils.c -index 3818a78..f65b6cd 100644 ---- a/src/utils/quant_levels_dec_utils.c -+++ b/src/utils/quant_levels_dec_utils.c - -@@ -261,9 +261,15 @@ - - int WebPDequantizeLevels(uint8_t* const data, int width, int height, int stride, - int strength) { -- const int radius = 4 * strength / 100; -+ int radius = 4 * strength / 100; -+ - if (strength < 0 || strength > 100) return 0; - if (data == NULL || width <= 0 || height <= 0) return 0; // bad params -+ -+ // limit the filter size to not exceed the image dimensions -+ if (2 * radius + 1 > width) radius = (width - 1) >> 1; -+ if (2 * radius + 1 > height) radius = (height - 1) >> 1; -+ - if (radius > 0) { - SmoothParams p; - memset(&p, 0, sizeof(p)); -diff --git a/src/mux/muxread.c b/src/mux/muxread.c -index ef50dae..fbe9f05 100644 ---- a/src/mux/muxread.c -+++ b/src/mux/muxread.c - -@@ -138,6 +138,7 @@ - wpi->is_partial_ = 1; // Waiting for a VP8 chunk. - break; - case WEBP_CHUNK_IMAGE: -+ if (wpi->img_ != NULL) goto Fail; // Only 1 image chunk allowed. - if (ChunkSetNth(&subchunk, &wpi->img_, 1) != WEBP_MUX_OK) goto Fail; - if (!MuxImageFinalize(wpi)) goto Fail; - wpi->is_partial_ = 0; // wpi is completely filled. -