From: Martin Matuška <martin@matuska.org>
Date: Fri, 3 May 2019 10:07:11 +0000 (+0200)
Subject: Merge branch 'master' into rar5_ossfuzz_fixes_3
X-Git-Tag: v3.4.0~54^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1186%2Fhead;p=thirdparty%2Flibarchive.git

Merge branch 'master' into rar5_ossfuzz_fixes_3
---

8b392da8c5cc5128b2d2ab845f07266738eba4d9
diff --cc libarchive/archive_read_support_format_rar5.c
index 9f6dc6437,4d0cb0875..773473c3d
--- a/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)) {