Merge pull request #161 from jairinhohw/master

Fixed blobs greater than 65535 bytes
fernandobatels · Nov 27, 2024 · 215f5c0 · 215f5c0
2 parents 5c094a2 + 83a612e
commit 215f5c0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/rsfbclient-native/src/params.rs b/rsfbclient-native/src/params.rs
@@ -244,15 +244,18 @@ fn binary_to_blob<T: IBase>(
     // Assert that the handle is valid
     debug_assert_ne!(handle, 0);
 
-    unsafe {
-        if ibase.isc_put_segment()(
-            &mut status[0],
-            &mut handle,
-            bytes.len() as u16,
-            bytes.as_ptr() as *mut std::os::raw::c_char,
-        ) != 0
-        {
-            return Err(status.as_error(ibase));
+    // Max segment size: 65535
+    for b in bytes.chunks(65535) {
+        unsafe {
+            if ibase.isc_put_segment()(
+                &mut status[0],
+                &mut handle,
+                b.len() as u16,
+                b.as_ptr() as *mut std::os::raw::c_char,
+            ) != 0
+            {
+                return Err(status.as_error(ibase));
+            }
         }
     }
 

diff --git a/src/tests/params.rs b/src/tests/params.rs
@@ -244,7 +244,7 @@ mk_tests_default! {
 
         let rstr: Vec<u8> = rand::thread_rng()
             .sample_iter::<u8, _>(Standard)
-            .take(10000)
+            .take(1024 * 1024)
             .collect();
 
         conn.execute("DROP TABLE PBIGBLOBBIN", ()).ok();
@@ -261,7 +261,7 @@ mk_tests_default! {
 
         let rstr: String = rand::thread_rng()
             .sample_iter::<char, _>(Standard)
-            .take(10000)
+            .take(1024 * 1024)
             .collect();
 
         conn.execute("DROP TABLE PBIGBLOBTEXT", ()).ok();

diff --git a/src/tests/row.rs b/src/tests/row.rs
@@ -166,7 +166,7 @@ mk_tests_default! {
 
         let rvec: Vec<u8> = rand::thread_rng()
             .sample_iter(Standard)
-            .take(10000)
+            .take(1024 * 1024)
             .collect();
 
         conn.execute("DROP TABLE RBIGBLOBBIN", ()).ok();
@@ -187,7 +187,7 @@ mk_tests_default! {
 
         let rstr: String = rand::thread_rng()
             .sample_iter::<char, _>(Standard)
-            .take(10000)
+            .take(1024 * 1024)
             .collect();
 
         conn.execute("DROP TABLE RBIGBLOBTEXT", ()).ok();