Skip to content

Commit 0a66874

Browse files
committed
more
1 parent 8b3b287 commit 0a66874

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/_macros.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,20 @@ macro_rules! handle_metadata_return {
6868
macro_rules! raw_metadata_getter_for_tables {
6969
($idtype: ty) => {
7070
fn raw_metadata<I: Into<$idtype>>(&self, row: I) -> Option<&[u8]> {
71-
$crate::sys::tsk_ragged_column_access::<'_, u8, $idtype, _, _>(
72-
row.into(),
73-
self.as_ref().metadata,
74-
self.num_rows(),
75-
self.as_ref().metadata_offset,
76-
self.as_ref().metadata_length,
77-
)
71+
assert!(
72+
(self.num_rows() != 0 && self.as_ref().metadata_length != 0)
73+
|| (!self.as_ref().metadata.is_null()
74+
&& !self.as_ref().metadata_offset.is_null())
75+
);
76+
unsafe {
77+
$crate::sys::tsk_ragged_column_access::<'_, u8, $idtype, _, _>(
78+
row.into(),
79+
self.as_ref().metadata,
80+
self.num_rows(),
81+
self.as_ref().metadata_offset,
82+
self.as_ref().metadata_length,
83+
)
84+
}
7885
}
7986
};
8087
}

0 commit comments

Comments
 (0)