read: handle address overflow in range lists

gimli-rs · Nov 3, 2022 · a2a4b78 · a2a4b78
1 parent 8e73ef0
commit a2a4b78
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/read/loclists.rs b/src/read/loclists.rs
@@ -575,6 +575,8 @@ impl<R: Reader> LocListIter<R> {
         &mut self,
         raw_loc: RawLocListEntry<R>,
     ) -> Result<Option<LocationListEntry<R>>> {
+        let mask = !0 >> (64 - self.raw.encoding.address_size * 8);
+
         let (range, data) = match raw_loc {
             RawLocListEntry::BaseAddress { addr } => {
                 self.base_address = addr;
@@ -595,7 +597,7 @@ impl<R: Reader> LocListIter<R> {
                 data,
             } => {
                 let begin = self.get_address(begin)?;
-                let end = begin + length;
+                let end = begin.wrapping_add(length) & mask;
                 (Range { begin, end }, data)
             }
             RawLocListEntry::DefaultLocation { data } => (
@@ -616,13 +618,10 @@ impl<R: Reader> LocListIter<R> {
                 begin,
                 length,
                 data,
-            } => (
-                Range {
-                    begin,
-                    end: begin + length,
-                },
-                data,
-            ),
+            } => {
+                let end = begin.wrapping_add(length) & mask;
+                (Range { begin, end }, data)
+            }
         };
 
         if range.begin > range.end {

diff --git a/src/read/rnglists.rs b/src/read/rnglists.rs
@@ -509,6 +509,8 @@ impl<R: Reader> RngListIter<R> {
     /// The raw range should have been obtained from `next_raw`.
     #[doc(hidden)]
     pub fn convert_raw(&mut self, raw_range: RawRngListEntry<R::Offset>) -> Result<Option<Range>> {
+        let mask = !0 >> (64 - self.raw.encoding.address_size * 8);
+
         let range = match raw_range {
             RawRngListEntry::BaseAddress { addr } => {
                 self.base_address = addr;
@@ -525,7 +527,7 @@ impl<R: Reader> RngListIter<R> {
             }
             RawRngListEntry::StartxLength { begin, length } => {
                 let begin = self.get_address(begin)?;
-                let end = begin + length;
+                let end = begin.wrapping_add(length) & mask;
                 Range { begin, end }
             }
             RawRngListEntry::AddressOrOffsetPair { begin, end }
@@ -535,10 +537,10 @@ impl<R: Reader> RngListIter<R> {
                 range
             }
             RawRngListEntry::StartEnd { begin, end } => Range { begin, end },
-            RawRngListEntry::StartLength { begin, length } => Range {
-                begin,
-                end: begin + length,
-            },
+            RawRngListEntry::StartLength { begin, length } => {
+                let end = begin.wrapping_add(length) & mask;
+                Range { begin, end }
+            }
         };
 
         if range.begin > range.end {