Refs #23753. Apply suggestions

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

Author: richiware

fastdds_python/src/swig/fastdds/rtps/common/InstanceHandle.i

@@ -43,7 +43,7 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
 
 %extend eprosima::fastdds::rtps::InstanceHandleValue_t {
 
-    // Constructor from sequence of 16 bytes (tupla/lista/bytes/bytearray)
+    // Constructor from a sequence of 16 bytes (tuple/list/bytes/bytearray)
     InstanceHandleValue_t(PyObject* seq) {
         eprosima::fastdds::rtps::InstanceHandleValue_t* self = new eprosima::fastdds::rtps::InstanceHandleValue_t();
         SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -85,7 +85,7 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
             if (it)
             {
                 PyObject* item {nullptr};
-                while ((item = PyIter_Next(it)))
+                while ((item = PyIter_Next(it)) && count < 16)
                 {
                     long val = PyLong_AsLong(item);
                     Py_DECREF(item);
@@ -108,7 +108,7 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
                     ++count;
                 }
                 Py_DECREF(it);
-                if (count != 16)
+                if ((nullptr != item || count != 16) && nullptr != self)
                 {
                     delete self;
                     self = nullptr;
@@ -171,12 +171,12 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
 
     // Setter from sequence (tuple/list/bytes/bytearray)
     void from_sequence(PyObject* seq) {
-        // Reutiliza el constructor para validar y copiar
+        // Reuse the constructor to validate and copy
         eprosima::fastdds::rtps::InstanceHandleValue_t* tmp = new_eprosima_fastdds_rtps_InstanceHandleValue_t(seq);
         if (nullptr != tmp)
         {
             for (int i = 0; i < 16; ++i) $self->value[i] = (*tmp)[i];
-            delete tmp; // evitar fuga
+            delete tmp; // avoid memory leak
         }
     }
 

fastdds_python/test/unittest/dds/common/test_InstanceHandle.py

@@ -93,3 +93,49 @@ def test_create_instance_handle_from_list_with_more_elements():
         ih.value = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
     repr = exception.getrepr()
     assert str(repr).split("\n")[0] == "ValueError: Expected 16 elements"
+
+
+def test_create_instance_handle_from_bytearray_with_with_negative_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(ValueError) as exception:
+        ih.value = bytearray([1, 2, 3, 4, 5, 6, 7, 8, 9, -10, 11, 12, 13, 14, 15, 16])
+    assert str(exception.value) == "byte must be in range(0, 256)"
+
+
+def test_create_instance_handle_from_bytearray_with_large_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(ValueError) as exception:
+        ih.value = bytearray([1, 2, 3, 4, 5, 6, 7, 8, 9, 1000, 11, 12, 13, 14, 15, 16])
+    assert str(exception.value) == "byte must be in range(0, 256)"
+
+
+def test_create_instance_handle_from_tuple_with_negative_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(SystemError) as exception:
+        ih.value = (1, 2, 3, 4, 5, 6, 7, 8, 9, -10, 11, 12, 13, 14, -15, 16)
+    repr = exception.getrepr()
+    assert str(repr).split("\n")[0] == "ValueError: Each value must be in 0..255"
+
+
+def test_create_instance_handle_from_tuple_with_large_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(SystemError) as exception:
+        ih.value = (1, 2, 3, 4, 5, 6, 7, 8, 9, 1000, 11, 12, 13, 14, 15, 16)
+    repr = exception.getrepr()
+    assert str(repr).split("\n")[0] == "ValueError: Each value must be in 0..255"
+
+
+def test_create_instance_handle_from_list_with_negative_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(SystemError) as exception:
+        ih.value = [1, 2, 3, 4, 5, 6, 7, 8, 9, -10, 11, 12, 13, 14, 15, 16]
+    repr = exception.getrepr()
+    assert str(repr).split("\n")[0] == "ValueError: Each value must be in 0..255"
+
+
+def test_create_instance_handle_from_list_with_large_number():
+    ih = fastdds.InstanceHandle_t()
+    with pytest.raises(SystemError) as exception:
+        ih.value = [1, 2, 3, 4, 5, 6, 7, 8, 9, 1000, 11, 12, 13, 14, 15, 16]
+    repr = exception.getrepr()
+    assert str(repr).split("\n")[0] == "ValueError: Each value must be in 0..255"