[#500] Truncate ID if provided buffer too small

eclipse-iceoryx · Nov 18, 2024 · 2b22f5e · 2b22f5e
1 parent 6737410
commit 2b22f5e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/iceoryx2-ffi/ffi/src/api/unique_listener_id.rs b/iceoryx2-ffi/ffi/src/api/unique_listener_id.rs
@@ -116,7 +116,11 @@ unsafe extern "C" fn iox2_unique_listener_id_value(
         debug_assert!(bytes.len() <= id_length, "id_length is too small");
 
         unsafe {
-            std::ptr::copy_nonoverlapping(bytes.as_ptr(), id_ptr, id_length);
+            std::ptr::copy_nonoverlapping(
+                bytes.as_ptr(),
+                id_ptr,
+                std::cmp::min(bytes.len(), id_length),
+            );
         }
     }
 }

diff --git a/iceoryx2-ffi/ffi/src/api/unique_notifier_id.rs b/iceoryx2-ffi/ffi/src/api/unique_notifier_id.rs
@@ -116,7 +116,11 @@ unsafe extern "C" fn iox2_unique_notifier_id_value(
         debug_assert!(bytes.len() <= id_length, "id_length is too small");
 
         unsafe {
-            std::ptr::copy_nonoverlapping(bytes.as_ptr(), id_ptr, id_length);
+            std::ptr::copy_nonoverlapping(
+                bytes.as_ptr(),
+                id_ptr,
+                std::cmp::min(bytes.len(), id_length),
+            );
         }
     }
 }

diff --git a/iceoryx2-ffi/ffi/src/api/unique_publisher_id.rs b/iceoryx2-ffi/ffi/src/api/unique_publisher_id.rs
@@ -116,7 +116,11 @@ unsafe extern "C" fn iox2_unique_publisher_id_value(
         debug_assert!(bytes.len() <= id_length, "id_length is too small");
 
         unsafe {
-            std::ptr::copy_nonoverlapping(bytes.as_ptr(), id_ptr, id_length);
+            std::ptr::copy_nonoverlapping(
+                bytes.as_ptr(),
+                id_ptr,
+                std::cmp::min(bytes.len(), id_length),
+            );
         }
     }
 }

diff --git a/iceoryx2-ffi/ffi/src/api/unique_subscriber_id.rs b/iceoryx2-ffi/ffi/src/api/unique_subscriber_id.rs
@@ -117,7 +117,11 @@ unsafe extern "C" fn iox2_unique_subscriber_id_value(
         debug_assert!(bytes.len() <= id_length, "id_length is too small");
 
         unsafe {
-            std::ptr::copy_nonoverlapping(bytes.as_ptr(), id_ptr, id_length);
+            std::ptr::copy_nonoverlapping(
+                bytes.as_ptr(),
+                id_ptr,
+                std::cmp::min(bytes.len(), id_length),
+            );
         }
     }
 }