BuildHuffmanTable: add an assert for offset[] bounds

And provide a clear comment explaining why the index of offset[] is
always checked within bounds.

Bug:webp:622
Change-Id: Id9b973a804b74c53dfb291f1a9dae649c0daed9d

.mailmap

@@ -17,4 +17,3 @@ Roberto Alanis <alanisbaez@google.com>
 Brian Ledger <brianpl@google.com>
 Maryla Ustarroz-Calonge <maryla@google.com>
 Yannis Guyon <yguyon@google.com>
-Henner Zeller <hzeller@google.com> <h.zeller@acm.org>

AUTHORS

@@ -10,11 +10,9 @@ Contributors:
 - Christian Duvivier (cduvivier at google dot com)
 - Christopher Degawa (ccom at randomderp dot com)
 - Clement Courbet (courbet at google dot com)
-- devtools-clrobot at google dot com (devtools-clrobot@google dot com)
 - Djordje Pesut (djordje dot pesut at imgtec dot com)
 - Frank (1433351828 at qq dot com)
 - Frank Barchard (fbarchard at google dot com)
-- Henner Zeller (hzeller at google dot com)
 - Hui Su (huisu at google dot com)
 - H. Vetinari (h dot vetinari at gmx dot com)
 - Ilya Kurdyukov (jpegqs at gmail dot com)

ChangeLog

@@ -1,62 +1,3 @@
-bf0bf1e7 api.md: add WebPValidateDecoderConfig to pseudocode
-e8ae210d update NEWS
-ce53efd7 bump version to 1.6.0
-1c333170 update AUTHORS
-85e098e5 webpmux: fix heap overflow w/-get/-set
-418340d8 Merge "Make histogram allocation and access more readable and type-safe." into main
-23ce76fa Merge "VP8BitReaderSetBuffer: move NULL check to call site" into main
-bbf3cbb1 VP8BitReaderSetBuffer: move NULL check to call site
-f6b87e03 Fix const style guide
-8852f89a Have lossless return the same results with/without -mt
-e015dcc0 Make histogram allocation and access more readable and type-safe.
-753ed11e enc_neon.c: fix aarch64 compilation w/gcc < 8.5.0
-0cd0b7a7 enc_fuzzer.cc: remove duplicate <cstdlib> include
-2209ffba swig,cosmetics: normalize includes
-15e2e1ee analysis_enc.c: remove unused include
-98c27801 IWYU: Include all headers for symbols used in files.
-eb3ff781 Only use valid histograms in VP8LHistogramSet
-57e324e2 Refactor VP8LHistogram histogram_enc.cc
-7191a602 Merge "Generalize trivial histograms" into main
-19696e0a Merge "alpha_processing_sse2: quiet signed conv warning" into main
-89b01ecc Merge "cwebp: add `-resize_mode`" into main
-52a430a7 Generalize trivial histograms
-e53e2130 Cache all costs in the histograms
-f8b360c4 alpha_processing_sse2: quiet signed conv warning
-eb4f8137 cwebp: add `-resize_mode`
-ad52d5fc dec/dsp/enc/utils,cosmetics: rm struct member '_' suffix
-ed7cd6a7 utils.c,cosmetics: rm struct member '_' suffix
-3a23b0f0 random_utils.[hc],cosmetics: rm struct member '_' suffix
-a99d0e6f quant_levels_dec_utils.c,cosmetics: rm struct member '_' suffix
-1ed4654d huffman_encode_utils.[hc],cosmetics: rm struct member '_' suffix
-f0689e48 config_enc.c,cosmetics: rm struct member '_' suffix
-24262266 mux,cosmetics: rm struct member '_' suffix
-3f54b1aa demux,cosmetics: rm struct member '_' suffix
-295804e4 examples,cosmetics: rm struct member '_' suffix
-5225592f Refactor VP8LHistogram to hide initializations from the user.
-00338240 Remove some computations in histogram clustering
-44f91b0d Speed DispatchAlpha_SSE2 up
-ee8e8c62 Fix member naming for VP8LHistogram
-a1ad3f1e Merge "Remove now unused ExtraCostCombined" into main
-321561b4 Remove now unused ExtraCostCombined
-e0ae21d2 WebPMemoryWriterClear: use WebPMemoryWriterInit
-a4183d94 Remove the computation of ExtraCost when comparing histograms
-f2b3f527 Get AVX2 into WebP lossless
-7c70ff7a Clean dsp/lossless includes
-9dd5ae81 Use the full register in PredictorSub13_SSE2
-613be8fc Makefile.vc: add /MP to CFLAGS
-1d86819f Merge changes I1437390a,I10a20de5,I1ac777d1 into main
-743a5f09 enc_neon: enable vld1q_u8_x4 for clang & msvc
-565da148 pngdec.c: add support for 'eXIf' tag
-319860e9 pngdec.c: support ImageMagick app1 exif text data
-815fc1e1 pngdec.c: add missing #ifdef for png_get_iCCP
-980b708e enc_neon: fix build w/aarch64 gcc < 9.4.0
-73b728cb cmake: bump minimum version to 3.16
-6a22b670 Add a function to validate a WebPDecoderConfig
-7ed2b10e Use consistently signed stride types.
-654bfb04 Avoid nullptr arithmetic in VP8BitReaderSetBuffer
-f8f24107 Fix potential "divide by zero" in examples found by coverity
-2af6c034 Merge tag 'v1.5.0'
-a4d7a715 update ChangeLog (tag: v1.5.0, origin/1.5.0)
 c3d85ce4 update NEWS
 ad14e811 tests/fuzzer/*: add missing <string_view> include
 74cd026e fuzz_utils.cc: fix build error w/WEBP_REDUCE_SIZE

NEWS

@@ -1,16 +1,3 @@
-- 6/30/2025 version 1.6.0
-  This is a binary compatible release.
-  API changes:
-    - libwebp: WebPValidateDecoderConfig
-  * additional x86 (AVX2, SSE2), general optimizations and compression
-    improvements for lossless
-  * `-mt` returns same results as single-threaded lossless (regressed in
-    1.5.0, #426506716)
-  * miscellaneous warning, bug & build fixes (#393104377, #397130631,
-    #398288323, #398066379, #427503509)
-  Tool updates:
-    * cwebp can restrict the use of `-resize` with `-resize_mode` (#405437935)
-
 - 12/19/2024 version 1.5.0
   This is a binary compatible release.
   API changes:

README.md

@@ -7,7 +7,7 @@
       \__\__/\____/\_____/__/ ____  ___
             / _/ /    \    \ /  _ \/ _/
            /  \_/   / /   \ \   __/  \__
-           \____/____/\_____/_____/____/v1.6.0
+           \____/____/\_____/_____/____/v1.5.0
 ```
 
 WebP codec is a library to encode and decode images in WebP format. This package

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libwebp], [1.6.0],
+AC_INIT([libwebp], [1.5.0],
         [https://issues.webmproject.org],,
         [https://developers.google.com/speed/webp])
 AC_CANONICAL_HOST

doc/api.md

@@ -202,7 +202,6 @@ config.output.u.RGBA.rgba = (uint8_t*) memory_buffer;
 config.output.u.RGBA.stride = scanline_stride;
 config.output.u.RGBA.size = total_size_of_the_memory_buffer;
 config.output.is_external_memory = 1;
-config_error = WebPValidateDecoderConfig(&config);  // not mandatory, but useful
 
 // E) Decode the WebP image. There are two variants w.r.t decoding image.
 // The first one (E.1) decodes the full image and the second one (E.2) is

extras/extras.c

@@ -25,7 +25,7 @@
 #include "webp/types.h"
 
 #define XTRA_MAJ_VERSION 1
-#define XTRA_MIN_VERSION 6
+#define XTRA_MIN_VERSION 5
 #define XTRA_REV_VERSION 0
 
 //------------------------------------------------------------------------------

sharpyuv/Makefile.am

@@ -33,7 +33,7 @@ libsharpyuv_la_SOURCES += sharpyuv_gamma.c sharpyuv_gamma.h
 libsharpyuv_la_SOURCES += sharpyuv.c sharpyuv.h
 
 libsharpyuv_la_CPPFLAGS = $(AM_CPPFLAGS)
-libsharpyuv_la_LDFLAGS = -no-undefined -version-info 1:2:1 -lm
+libsharpyuv_la_LDFLAGS = -no-undefined -version-info 1:1:1 -lm
 libsharpyuv_la_LIBADD =
 libsharpyuv_la_LIBADD += libsharpyuv_sse2.la
 libsharpyuv_la_LIBADD += libsharpyuv_neon.la

sharpyuv/libsharpyuv.rc

@@ -6,8 +6,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,4,2
- PRODUCTVERSION 0,0,4,2
+ FILEVERSION 0,0,4,1
+ PRODUCTVERSION 0,0,4,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Google, Inc."
             VALUE "FileDescription", "libsharpyuv DLL"
-            VALUE "FileVersion", "0.4.2"
+            VALUE "FileVersion", "0.4.1"
             VALUE "InternalName", "libsharpyuv.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2025"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
             VALUE "OriginalFilename", "libsharpyuv.dll"
             VALUE "ProductName", "SharpYuv Library"
-            VALUE "ProductVersion", "0.4.2"
+            VALUE "ProductVersion", "0.4.1"
         END
     END
     BLOCK "VarFileInfo"

sharpyuv/sharpyuv.h

@@ -52,7 +52,7 @@ extern "C" {
 // SharpYUV API version following the convention from semver.org
 #define SHARPYUV_VERSION_MAJOR 0
 #define SHARPYUV_VERSION_MINOR 4
-#define SHARPYUV_VERSION_PATCH 2
+#define SHARPYUV_VERSION_PATCH 1
 // Version as a uint32_t. The major number is the high 8 bits.
 // The minor number is the middle 8 bits. The patch number is the low 16 bits.
 #define SHARPYUV_MAKE_VERSION(MAJOR, MINOR, PATCH) \

src/Makefile.am

@@ -36,7 +36,7 @@ libwebp_la_LIBADD += utils/libwebputils.la
 # other than the ones listed on the command line, i.e., after linking, it will
 # not have unresolved symbols. Some platforms (Windows among them) require all
 # symbols in shared libraries to be resolved at library creation.
-libwebp_la_LDFLAGS = -no-undefined -version-info 9:0:2
+libwebp_la_LDFLAGS = -no-undefined -version-info 8:10:1
 libwebpincludedir = $(includedir)/webp
 pkgconfig_DATA = libwebp.pc
 
@@ -48,7 +48,7 @@ if BUILD_LIBWEBPDECODER
   libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la
   libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la
 
-  libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 5:0:2
+  libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:10:1
   pkgconfig_DATA += libwebpdecoder.pc
 endif
 

src/dec/vp8i_dec.h

@@ -36,7 +36,7 @@ extern "C" {
 
 // version numbers
 #define DEC_MAJ_VERSION 1
-#define DEC_MIN_VERSION 6
+#define DEC_MIN_VERSION 5
 #define DEC_REV_VERSION 0
 
 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline).

src/demux/Makefile.am

@@ -13,6 +13,6 @@ noinst_HEADERS =
 noinst_HEADERS += ../webp/format_constants.h
 
 libwebpdemux_la_LIBADD = ../libwebp.la
-libwebpdemux_la_LDFLAGS = -no-undefined -version-info 2:17:0
+libwebpdemux_la_LDFLAGS = -no-undefined -version-info 2:16:0
 libwebpdemuxincludedir = $(includedir)/webp
 pkgconfig_DATA = libwebpdemux.pc

src/demux/demux.c

@@ -27,7 +27,7 @@
 #include "src/webp/types.h"
 
 #define DMUX_MAJ_VERSION 1
-#define DMUX_MIN_VERSION 6
+#define DMUX_MIN_VERSION 5
 #define DMUX_REV_VERSION 0
 
 typedef struct {

src/demux/libwebpdemux.rc

@@ -6,8 +6,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,6,0
- PRODUCTVERSION 1,0,6,0
+ FILEVERSION 1,0,5,0
+ PRODUCTVERSION 1,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Google, Inc."
             VALUE "FileDescription", "libwebpdemux DLL"
-            VALUE "FileVersion", "1.6.0"
+            VALUE "FileVersion", "1.5.0"
             VALUE "InternalName", "libwebpdemux.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2025"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
             VALUE "OriginalFilename", "libwebpdemux.dll"
             VALUE "ProductName", "WebP Image Demuxer"
-            VALUE "ProductVersion", "1.6.0"
+            VALUE "ProductVersion", "1.5.0"
         END
     END
     BLOCK "VarFileInfo"

src/enc/vp8i_enc.h

@@ -34,7 +34,7 @@ extern "C" {
 
 // version numbers
 #define ENC_MAJ_VERSION 1
-#define ENC_MIN_VERSION 6
+#define ENC_MIN_VERSION 5
 #define ENC_REV_VERSION 0
 
 enum { MAX_LF_LEVELS = 64,       // Maximum loop filter level

src/libwebp.rc

@@ -6,8 +6,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,6,0
- PRODUCTVERSION 1,0,6,0
+ FILEVERSION 1,0,5,0
+ PRODUCTVERSION 1,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Google, Inc."
             VALUE "FileDescription", "libwebp DLL"
-            VALUE "FileVersion", "1.6.0"
+            VALUE "FileVersion", "1.5.0"
             VALUE "InternalName", "libwebp.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2025"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
             VALUE "OriginalFilename", "libwebp.dll"
             VALUE "ProductName", "WebP Image Codec"
-            VALUE "ProductVersion", "1.6.0"
+            VALUE "ProductVersion", "1.5.0"
         END
     END
     BLOCK "VarFileInfo"

src/libwebpdecoder.rc

@@ -6,8 +6,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,6,0
- PRODUCTVERSION 1,0,6,0
+ FILEVERSION 1,0,5,0
+ PRODUCTVERSION 1,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Google, Inc."
             VALUE "FileDescription", "libwebpdecoder DLL"
-            VALUE "FileVersion", "1.6.0"
+            VALUE "FileVersion", "1.5.0"
             VALUE "InternalName", "libwebpdecoder.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2025"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
             VALUE "OriginalFilename", "libwebpdecoder.dll"
             VALUE "ProductName", "WebP Image Decoder"
-            VALUE "ProductVersion", "1.6.0"
+            VALUE "ProductVersion", "1.5.0"
         END
     END
     BLOCK "VarFileInfo"

src/mux/Makefile.am

@@ -17,6 +17,6 @@ noinst_HEADERS =
 noinst_HEADERS += ../webp/format_constants.h
 
 libwebpmux_la_LIBADD = ../libwebp.la
-libwebpmux_la_LDFLAGS = -no-undefined -version-info 4:2:1 -lm
+libwebpmux_la_LDFLAGS = -no-undefined -version-info 4:1:1 -lm
 libwebpmuxincludedir = $(includedir)/webp
 pkgconfig_DATA = libwebpmux.pc

src/mux/libwebpmux.rc

@@ -6,8 +6,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,6,0
- PRODUCTVERSION 1,0,6,0
+ FILEVERSION 1,0,5,0
+ PRODUCTVERSION 1,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Google, Inc."
             VALUE "FileDescription", "libwebpmux DLL"
-            VALUE "FileVersion", "1.6.0"
+            VALUE "FileVersion", "1.5.0"
             VALUE "InternalName", "libwebpmux.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2025"
+            VALUE "LegalCopyright", "Copyright (C) 2024"
             VALUE "OriginalFilename", "libwebpmux.dll"
             VALUE "ProductName", "WebP Image Muxer"
-            VALUE "ProductVersion", "1.6.0"
+            VALUE "ProductVersion", "1.5.0"
         END
     END
     BLOCK "VarFileInfo"

src/mux/muxi.h

@@ -32,7 +32,7 @@ extern "C" {
 // Defines and constants.
 
 #define MUX_MAJ_VERSION 1
-#define MUX_MIN_VERSION 6
+#define MUX_MIN_VERSION 5
 #define MUX_REV_VERSION 0
 
 // Chunk object.

src/utils/huffman_utils.c

@@ -124,7 +124,11 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits,
     const int symbol_code_length = code_lengths[symbol];
     if (code_lengths[symbol] > 0) {
       if (sorted != NULL) {
-        if(offset[symbol_code_length] >= code_lengths_size) {
+        assert(offset[symbol_code_length] < code_lengths_size);
+        // The following check is not redundant with the assert. It prevents a
+        // potential buffer overflow that the optimizer might not be able to
+        // rule out on its own.
+        if (offset[symbol_code_length] >= code_lengths_size) {
           return 0;
         }
         sorted[offset[symbol_code_length]++] = symbol;