Skip to content

Commit 1fe2392

Browse files
authored
Merge pull request #65 from MRPT/fix/no-joystick-crash
BUGFIX: Crash due to access uninitialized memory when no joystick is …
2 parents b370a4b + 6fbe488 commit 1fe2392

3 files changed

+3
-3
lines changed

modules/simulator/src/VehicleDynamics/VehicleDifferential_ControllerTwistIdeal.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void DynamicsDifferential::ControllerTwistIdeal::teleop_interface(
7575

7676
out.append_gui_lines += "[Controller=" + std::string(class_name()) + "]";
7777

78-
if (in.js)
78+
if (in.js && in.js->axes.size() >= 2)
7979
{
8080
const auto& js = in.js.value();
8181
const float js_x = js.axes[0];

modules/simulator/src/VehicleDynamics/VehicleDifferential_ControllerTwistPID.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void DynamicsDifferential::ControllerTwistPID::teleop_interface(
127127

128128
out.append_gui_lines += "[Controller=" + std::string(class_name()) + "]";
129129

130-
if (in.js)
130+
if (in.js && in.js->axes.size() >= 2)
131131
{
132132
const auto& js = in.js.value();
133133
const float js_x = js.axes[0];

modules/simulator/src/VehicleDynamics/Vehicleackermann_Drivetrain_ControllerTwistFrontSteerPID.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void DynamicsAckermannDrivetrain::ControllerTwistFrontSteerPID::teleop_interface
111111

112112
out.append_gui_lines += "[Controller=" + std::string(class_name()) + "]";
113113

114-
if (in.js)
114+
if (in.js && in.js->axes.size() >= 2)
115115
{
116116
const auto& js = in.js.value();
117117
const float js_x = js.axes[0];

0 commit comments

Comments
 (0)