From: Martin Matuska <martin@matuska.org>
Date: Fri, 3 May 2019 10:18:09 +0000 (+0200)
Subject: Merge pull request #1186 from antekone/rar5_ossfuzz_fixes_3
X-Git-Tag: v3.4.0~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d24a255433d151423e055837cdfb72c3f7e7cf;p=thirdparty%2Flibarchive.git

Merge pull request #1186 from antekone/rar5_ossfuzz_fixes_3

RAR5 reader: fix invalid type used for dictionary size mask.
---

60d24a255433d151423e055837cdfb72c3f7e7cf
diff --cc libarchive/archive_read_support_format_rar5.c
index 4d0cb0875,773473c3d..a2e5b68e7
--- a/libarchive/archive_read_support_format_rar5.c
+++ b/libarchive/archive_read_support_format_rar5.c
@@@ -494,8 -494,9 +494,7 @@@ static inline struct rar5* get_context(
  }
  
  /* Convenience functions used by filter implementations. */
--
- 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)) {