Update XZ Utils to 5.0.4 (third_party)

src/xz/list.c

 ///////////////////////////////////////////////////////////////////////////////
 //
 /// \file       list.c
 /// \brief      Listing information about .xz files
 //
 //  Author:     Lasse Collin
 //
 //  This file has been put into the public domain.
 //  You can do whatever you want with this file.
 //
@@ skipping 364 matching lines @@
                                 - lzma_check_size(iter->stream.flags->check),
                         LZMA_BLOCK_HEADER_SIZE_MAX);
         io_buf buf;
         if (io_pread(pair, &buf, size, iter->block.compressed_file_offset))
                 return true;
 
         // Zero would mean Index Indicator and thus not a valid Block.
         if (buf.u8[0] == 0)
                 goto data_error;
 
+        // Initialize the block structure and decode Block Header Size.
+        lzma_filter filters[LZMA_FILTERS_MAX + 1];
         lzma_block block;
-        lzma_filter filters[LZMA_FILTERS_MAX + 1];
-
-        // Initialize the pointers so that they can be passed to free().
-        for (size_t i = 0; i < ARRAY_SIZE(filters); ++i)
-                filters[i].options = NULL;
-
-        // Initialize the block structure and decode Block Header Size.
         block.version = 0;
         block.check = iter->stream.flags->check;
         block.filters = filters;
 
         block.header_size = lzma_block_header_size_decode(buf.u8[0]);
         if (block.header_size > size)
                 goto data_error;
 
         // Decode the Block Header.
         switch (lzma_block_header_decode(&block, NULL, buf.u8)) {
@@ skipping 27 matching lines @@
         xfi->all_have_sizes &= block.compressed_size != LZMA_VLI_UNKNOWN
                         && block.uncompressed_size != LZMA_VLI_UNKNOWN;
 
         // Validate or set block.compressed_size.
         switch (lzma_block_compressed_size(&block,
                         iter->block.unpadded_size)) {
         case LZMA_OK:
                 break;
 
         case LZMA_DATA_ERROR:
+                // Free the memory allocated by lzma_block_header_decode().
+                for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i)
+                        free(filters[i].options);
+
                 goto data_error;
 
         default:
                 message_bug();
         }
 
         // Copy the known sizes.
         bhi->header_size = block.header_size;
         bhi->compressed_size = block.compressed_size;
 
         // Calculate the decoder memory usage and update the maximum
         // memory usage of this Block.
         bhi->memusage = lzma_raw_decoder_memusage(filters);
         if (xfi->memusage_max < bhi->memusage)
                 xfi->memusage_max = bhi->memusage;
 
         // Convert the filter chain to human readable form.
         message_filters_to_str(bhi->filter_chain, filters, false);
 
         // Free the memory allocated by lzma_block_header_decode().
         for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i)
                 free(filters[i].options);
 
         return false;
 
 data_error:
         // Show the error message.
         message_error("%s: %s", pair->src_name,
                         message_strm(LZMA_DATA_ERROR));
-
-        // Free the memory allocated by lzma_block_header_decode().
-        // This is truly needed only if we get here after a succcessful
-        // call to lzma_block_header_decode() but it doesn't hurt to
-        // always do it.
-        for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i)
-                free(filters[i].options);
-
         return true;
 }
 
 
 /// \brief      Parse the Check field and put it into check_value[]
 ///
 /// \return     False on success, true on error.
 static bool
 parse_check_value(file_pair *pair, const lzma_index_iter *iter)
 {
@@ skipping 622 matching lines @@
                 // broken files.
                 if (!fail)
                         update_totals(&xfi);
 
                 lzma_index_end(xfi.idx, NULL);
         }
 
         io_close(pair, false);
         return;
 }