Merge pull request #2950 from randaz81/fakeLaserWithMotor_fix

Valgrind fix fo FakeLaserWithMotor device
robotology · Mar 3, 2023 · bbb01fc · bbb01fc
2 parents 35277a5 + ceb11b0
commit bbb01fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor.cpp b/src/devices/fakeLaserWithMotor/fakeLaserWithMotor.cpp
@@ -203,6 +203,9 @@ bool FakeLaserWithMotor::open(yarp::os::Searchable& config)
 bool FakeLaserWithMotor::close()
 {
     PeriodicThread::stop();
+    dealloc();
+    m_rpcPort.interrupt();
+    m_rpcPort.close();
 
     return true;
 }

diff --git a/src/devices/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp b/src/devices/fakeLaserWithMotor/fakeLaserWithMotor_motors.cpp
@@ -341,14 +341,14 @@ bool FakeLaserWithMotor::alloc(int nj)
 
 bool FakeLaserWithMotor::dealloc()
 {
+    checkAndDestroy(_axisName);
+    checkAndDestroy(_jointType);
     checkAndDestroy(_controlModes);
     checkAndDestroy(_encoders);
     checkAndDestroy(_posCtrl_references);
-    checkAndDestroy(_command_speeds);
     checkAndDestroy(_ref_speeds);
+    checkAndDestroy(_command_speeds);
     checkAndDestroy(_ref_accs);
-    checkAndDestroy(_axisName);
-    checkAndDestroy(_jointType);
     return true;
 }