Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc b/third_party/jpeg-xl/lib/jxl/enc_huffman.cc
index 3eab2c218a..6af92f6ed5 100644
--- a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc
+++ b/third_party/jpeg-xl/lib/jxl/enc_huffman.cc
@@ -70,6 +70,7 @@ void StoreHuffmanTreeToBitMask(const size_t huffman_tree_size,
   for (size_t i = 0; i < huffman_tree_size; ++i) {
     size_t ix = huffman_tree[i];
     writer->Write(code_length_bitdepth[ix], code_length_bitdepth_symbols[ix]);
+    JXL_ASSERT(ix <= 17);
     // Extra bits
     switch (ix) {
       case 16:
@@ -78,6 +79,9 @@ void StoreHuffmanTreeToBitMask(const size_t huffman_tree_size,
       case 17:
         writer->Write(3, huffman_tree_extra_bits[i]);
         break;
+      default:
+        // no-op
+        break;
     }
   }
 }