Use u64 instead of usize or i64 for offsets

Author: sudoBash418

src/symbolize/gimli.rs

@@ -270,7 +270,7 @@ struct Cache {
 struct Library {
     name: OsString,
     #[cfg(target_os = "android")]
-    zip_offset: Option<i64>,
+    zip_offset: Option<u64>,
     #[cfg(target_os = "aix")]
     /// On AIX, the library mmapped can be a member of a big-archive file.
     /// For example, with a big-archive named libfoo.a containing libbar.so,

src/symbolize/gimli/elf.rs

@@ -50,8 +50,8 @@ impl Mapping {
     /// `zip_offset` should be page-aligned; the dynamic linker
     /// requires this when it loads libraries.
     #[cfg(target_os = "android")]
-    pub fn new_android(path: &Path, zip_offset: Option<i64>) -> Option<Mapping> {
-        fn map_embedded_library(path: &Path, zip_offset: i64) -> Option<Mapping> {
+    pub fn new_android(path: &Path, zip_offset: Option<u64>) -> Option<Mapping> {
+        fn map_embedded_library(path: &Path, zip_offset: u64) -> Option<Mapping> {
             // get path of ZIP archive (delimited by `!/`)
             let raw_path = path.as_os_str().as_bytes();
             let zip_path = raw_path
@@ -61,12 +61,12 @@ impl Mapping {
                 .map(|(index, _)| Path::new(OsStr::from_bytes(raw_path.split_at(index).0)))?;
 
             let file = fs::File::open(zip_path).ok()?;
-            let len: usize = file.metadata().ok()?.len().try_into().ok()?;
+            let len = file.metadata().ok()?.len();
 
             // NOTE: we map the remainder of the entire archive instead of just the library so we don't have to determine its length
             // NOTE: mmap will fail if `zip_offset` is not page-aligned
             let map = unsafe {
-                super::mmap::Mmap::map(&file, len - usize::try_from(zip_offset).ok()?, zip_offset)
+                super::mmap::Mmap::map(&file, usize::try_from(len - zip_offset).ok()?, zip_offset)
             }?;
 
             Mapping::mk(map, |map, stash| {

src/symbolize/gimli/libs_dl_iterate_phdr.rs

@@ -85,7 +85,7 @@ unsafe extern "C" fn callback(
         }
     };
     #[cfg(target_os = "android")]
-    let zip_offset: Option<i64> = {
+    let zip_offset: Option<u64> = {
         // only check for ZIP-embedded file if we have data from /proc/self/maps
         maps.as_ref().and_then(|maps| {
             // check if file is embedded within a ZIP archive by searching for `!/`
@@ -96,7 +96,7 @@ unsafe extern "C" fn callback(
                     // find MapsEntry matching library's base address
                     maps.iter()
                         .find(|m| m.ip_matches(dlpi_addr as usize))
-                        .and_then(|m| m.offset().try_into().ok())
+                        .and_then(|m| Some(m.offset()))
                 })
         })
     };

src/symbolize/gimli/mmap_fake.rs

@@ -8,11 +8,11 @@ pub struct Mmap {
 }
 
 impl Mmap {
-    pub unsafe fn map(mut file: &File, len: usize, offset: i64) -> Option<Mmap> {
+    pub unsafe fn map(mut file: &File, len: usize, offset: u64) -> Option<Mmap> {
         let mut mmap = Mmap {
             vec: Vec::with_capacity(len),
         };
-        file.seek(SeekFrom::Start(offset.try_into().ok()?));
+        file.seek(SeekFrom::Start(offset));
         file.read_to_end(&mut mmap.vec).ok()?;
         Some(mmap)
     }

src/symbolize/gimli/mmap_unix.rs

@@ -15,7 +15,7 @@ pub struct Mmap {
 }
 
 impl Mmap {
-    pub unsafe fn map(file: &File, len: usize, offset: i64) -> Option<Mmap> {
+    pub unsafe fn map(file: &File, len: usize, offset: u64) -> Option<Mmap> {
         let ptr = mmap64(
             ptr::null_mut(),
             len,

src/symbolize/gimli/mmap_windows.rs

@@ -16,10 +16,7 @@ pub struct Mmap {
 }
 
 impl Mmap {
-    pub unsafe fn map(file: &File, len: usize, offset: i64) -> Option<Mmap> {
-        if offset.is_negative() {
-            return None;
-        }
+    pub unsafe fn map(file: &File, len: usize, offset: u64) -> Option<Mmap> {
         let file = file.try_clone().ok()?;
         let mapping = CreateFileMappingA(
             file.as_raw_handle(),

src/symbolize/gimli/parse_running_mmaps_unix.rs

@@ -20,7 +20,7 @@ pub(super) struct MapsEntry {
     /// p = private (copy on write)
     perms: [char; 4],
     /// Offset into the file (or "whatever").
-    offset: usize,
+    offset: u64,
     /// device (major, minor)
     dev: (usize, usize),
     /// inode on the device. 0 indicates that no inode is associated with the memory region (e.g. uninitalized data aka BSS).
@@ -78,7 +78,7 @@ impl MapsEntry {
     }
 
     #[cfg(target_os = "android")]
-    pub(super) fn offset(&self) -> usize {
+    pub(super) fn offset(&self) -> u64 {
         self.offset
     }
 }
@@ -123,6 +123,8 @@ impl FromStr for MapsEntry {
         let pathname_str = s.trim_start();
 
         let hex = |s| usize::from_str_radix(s, 16).map_err(|_| "Couldn't parse hex number");
+        let hex64 = |s| u64::from_str_radix(s, 16).map_err(|_| "Couldn't parse hex number");
+
         let address = if let Some((start, limit)) = range_str.split_once('-') {
             (hex(start)?, hex(limit)?)
         } else {
@@ -137,7 +139,7 @@ impl FromStr for MapsEntry {
             }
             perms
         };
-        let offset = hex(offset_str)?;
+        let offset = hex64(offset_str)?;
         let dev = if let Some((major, minor)) = dev_str.split_once(':') {
             (hex(major)?, hex(minor)?)
         } else {