Merge branch 'master' into rar5_ossfuzz_fixes_3

diff --cc libarchive/archive_read_support_format_rar5.c
index 9f6dc6437cff02321610a60e83158cda4c313735,4d0cb0875febd5db909b84075eb172886249fe65..773473c3d2a7347606188fd25c0dbb336c7d3993
--- 1/libarchive/archive_read_support_format_rar5.c
--- 2/libarchive/archive_read_support_format_rar5.c
+++ b/libarchive/archive_read_support_format_rar5.c
@@@ -495,17 -495,7 +495,8 @@@ static inline struct rar5* get_context(
  
  /* Convenience functions used by filter implementations. */
  
- static uint32_t read_filter_data(struct rar5* rar, uint32_t offset) {
-     return archive_le32dec(&rar->cstate.window_buf[offset]);
- }
- 
- static void write_filter_data(struct rar5* rar, uint32_t offset,
-         uint32_t value)
- {
-     archive_le32enc(&rar->cstate.filtered_buf[offset], value);
- }
 -static void circular_memcpy(uint8_t* dst, uint8_t* window, const int mask,
 +
 +static void circular_memcpy(uint8_t* dst, uint8_t* window, const uint64_t mask,
          int64_t start, int64_t end)
  {
      if((start & mask) > (end & mask)) {

diff --cc libarchive/test/test_read_format_rar5.c
Simple merge