Merge pull request #218 from elfenpiff/iox2-213-increase-test-container-coverage

[#213] increase test container coverage

Author: elfenpiff

iceoryx2-bb/container/src/byte_string.rs

@@ -45,15 +45,15 @@ use iceoryx2_bb_log::{fail, fatal_panic};
 ///
 ///  * The string must be '\0' (null) terminated.
 ///
-pub unsafe fn strlen(ptr: *mut core::ffi::c_char) -> usize {
+pub unsafe fn strnlen(ptr: *const core::ffi::c_char, len: usize) -> usize {
     const NULL_TERMINATION: core::ffi::c_char = 0;
-    for i in 0..isize::MAX {
-        if *ptr.offset(i) == NULL_TERMINATION {
-            return i as usize;
+    for i in 0..len {
+        if *ptr.add(i) == NULL_TERMINATION {
+            return i;
         }
     }
 
-    unreachable!()
+    len
 }
 
 /// Error which can occur when a [`FixedSizeByteString`] is modified.
@@ -64,7 +64,7 @@ pub enum FixedSizeByteStringModificationError {
 
 impl std::fmt::Display for FixedSizeByteStringModificationError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::write!(f, "{}::{:?}", std::stringify!(Self), self)
+        std::write!(f, "FixedSizeByteStringModificationError::{:?}", self)
     }
 }
 
@@ -278,9 +278,9 @@ impl<const CAPACITY: usize> FixedSizeByteString<CAPACITY> {
     ///  * `ptr` must be '\0' (null) terminated
     ///
     pub unsafe fn from_c_str(
-        ptr: *mut core::ffi::c_char,
+        ptr: *const core::ffi::c_char,
     ) -> Result<Self, FixedSizeByteStringModificationError> {
-        let string_length = strlen(ptr);
+        let string_length = strnlen(ptr, CAPACITY + 1);
         if CAPACITY < string_length {
             return Err(FixedSizeByteStringModificationError::InsertWouldExceedCapacity);
         }

iceoryx2-bb/container/src/semantic_string.rs

@@ -61,7 +61,7 @@
 //! ```
 
 use crate::byte_string::FixedSizeByteStringModificationError;
-use crate::byte_string::{as_escaped_string, strlen, FixedSizeByteString};
+use crate::byte_string::{as_escaped_string, strnlen, FixedSizeByteString};
 use iceoryx2_bb_elementary::enum_gen;
 use iceoryx2_bb_log::fail;
 use std::fmt::{Debug, Display};
@@ -80,7 +80,7 @@ enum_gen! {
 
 impl std::fmt::Display for SemanticStringError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::write!(f, "{}::{:?}", std::stringify!(Self), self)
+        std::write!(f, "SemanticStringError::{:?}", self)
     }
 }
 
@@ -148,7 +148,10 @@ pub trait SemanticString<const CAPACITY: usize>:
     ///   * The contents must not contain invalid UTF-8 characters
     ///
     unsafe fn from_c_str(ptr: *mut std::ffi::c_char) -> Result<Self, SemanticStringError> {
-        Self::new(std::slice::from_raw_parts(ptr as *const u8, strlen(ptr)))
+        Self::new(std::slice::from_raw_parts(
+            ptr as *const u8,
+            strnlen(ptr, CAPACITY + 1),
+        ))
     }
 
     /// Returns the contents as a slice