Panic on large offsets

Author: lucic71

libcc2rs/src/field.rs

@@ -1562,11 +1562,10 @@ mod tests {
     }
 
     #[test]
+    #[should_panic(expected = "too large for a pointer to its elements")]
     fn far_vector_field_ptr() {
-        let holder = holds_far();
-        let far: Ptr<Far> = field_ptr!(holder, far);
-        let v: Ptr<i32> = field_ref!(far, v).as_pointer().decay();
-        assert_eq!(v.offset(1).read(), 6);
+        let far: Ptr<Far> = field_ptr!(holds_far(), far);
+        let _: Ptr<i32> = field_ref!(far, v).as_pointer().decay();
     }
 
     #[test]
@@ -1576,8 +1575,6 @@ mod tests {
         let s: Value<Far> = Rc::new(RefCell::new(holds_far().borrow().far.clone()));
         let arr: Ptr<i32> = array_field_ptr!(s, arr);
         assert_eq!(arr.offset(2).read(), 3);
-        let v: Ptr<i32> = field_ref!(s, v).as_pointer().decay();
-        assert_eq!(v.offset(1).read(), 6);
     }
 
     #[derive(Clone, Default, Record, ByteRepr)]

libcc2rs/src/rc.rs

@@ -1466,12 +1466,10 @@ impl<T: 'static> Ptr<Vec<T>> {
                 kind: PtrKind::HeapVec(weak.clone()),
             },
             // The elements of a field are reached through the struct.
-            PtrKind::Field(root, _, FieldShape::Single) if u32::try_from(self.offset).is_ok() => {
-                Ptr {
-                    offset: 0,
-                    kind: PtrKind::Field(root.clone(), self.offset as u32, FieldShape::Vec),
-                }
-            }
+            PtrKind::Field(root, _, FieldShape::Single) => Ptr {
+                offset: 0,
+                kind: PtrKind::Field(root.clone(), field_offset(self.offset), FieldShape::Vec),
+            },
             PtrKind::StackVec(_)
             | PtrKind::HeapVec(_)
             | PtrKind::StackArray(_)