Changeset 468:a1bfec1a20ae in finroc_core

Timestamp:

12.02.2020 14:34:04 (2 weeks ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

14.08

Phase:

public

Message:

Fixes bug that could lead to cases of handles from the range of port handles being assigned to non-ports (this does not appear to be critical)

Files:

• internal/tFrameworkElementRegister.cpp (modified) (1 diff)
• tFrameworkElement.cpp (modified) (1 diff)

internal/tFrameworkElementRegister.cpp

@@ -204 +204 @@
   assert(array_chunks[primary_index] && array_chunks[primary_index]->array[secondary_index] && array_chunks[primary_index]->array[secondary_index]->GetHandle() == handle);
   array_chunks[primary_index]->array[secondary_index] = NULL;
-  unused_slot_queue.push(tUnusedSlot(handle));
+  (handle >= cFIRST_PORT_HANDLE ? unused_port_slot_queue : unused_slot_queue).push(tUnusedSlot(handle));
 }
 

tFrameworkElement.cpp

@@ -128 +128 @@
   }
 
+  assert((handle >= internal::tFrameworkElementRegister::cFIRST_PORT_HANDLE) == flags.Get(tFlag::PORT) && "Invalid handle assigned");
   FINROC_LOG_PRINT(DEBUG_VERBOSE_1, "Constructing tFrameworkElement (" , this, ")");
 }