Merge pull request #158 from Noriebalbinot/master

fix compatibility issues
fernandobatels · Aug 28, 2024 · 3dcdc94 · 3dcdc94
2 parents 38589cd + 1d7ab60
commit 3dcdc94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rsfbclient-native/src/varchar.rs b/rsfbclient-native/src/varchar.rs
@@ -35,7 +35,10 @@ impl Varchar {
     pub fn as_bytes(&self) -> &[u8] {
         let len = u16::min(self.capacity, unsafe { self.ptr.as_ref().len }) as usize;
 
-        unsafe { self.ptr.as_ref().data.get_unchecked(..len) }
+        unsafe {
+            let ptr = self.ptr.as_ref().data.as_ptr();
+            std::slice::from_raw_parts(ptr, len).get_unchecked(..len)
+        }
     }
 
     /// Get the pointer to the inner type

diff --git a/rsfbclient-native/src/xsqlda.rs b/rsfbclient-native/src/xsqlda.rs
@@ -36,7 +36,11 @@ impl XSqlDa {
     /// Returns a mutable reference to a XSQLVAR
     pub fn get_xsqlvar_mut(&mut self, col: usize) -> Option<&mut ibase::XSQLVAR> {
         if col < self.len as usize {
-            let xsqlvar = unsafe { self.ptr.as_mut().sqlvar.get_unchecked_mut(col as usize) };
+            let xsqlvar = unsafe {
+                let ptr = self.ptr.as_mut().sqlvar.as_mut_ptr();
+                std::slice::from_raw_parts_mut(ptr, self.len as usize)
+                    .get_unchecked_mut(col as usize)
+            };
 
             Some(xsqlvar)
         } else {