Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

map-size restriction to avoid overflow and nullptr caused by user-misconfiguration #3242

Merged
merged 11 commits into from
Oct 14, 2022
Merged

map-size restriction to avoid overflow and nullptr caused by user-misconfiguration #3242

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
950d76c
odom alpha restriction
Cryst4L9527 Oct 11, 2022
b673938
odom alpha code style
Cryst4L9527 Oct 11, 2022
ec5adb5
odom alpha code style
Cryst4L9527 Oct 11, 2022
d639b1a
odom alpha code style
Cryst4L9527 Oct 11, 2022
a457fd5
Merge branch 'ros-planning:main' into main
Cryst4L9527 Oct 12, 2022
1c0827d
map-size restriction
Cryst4L9527 Oct 12, 2022
b5ee0b5
Merge branch 'main' of https://github.com/Cryst4L9527/navigation2 int…
Cryst4L9527 Oct 12, 2022
2005e28
map-size code style
Cryst4L9527 Oct 12, 2022
79ecfb0
map-size rejection
Cryst4L9527 Oct 13, 2022
e8d73d5
map-size codestyle
Cryst4L9527 Oct 13, 2022
44c7dbf
map-size return false
Cryst4L9527 Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions nav2_costmap_2d/src/costmap_2d_ros.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,27 @@ Costmap2DROS::dynamicParametersCallback(std::vector<rclcpp::Parameter> parameter
}
} else if (type == ParameterType::PARAMETER_INTEGER) {
if (name == "width") {
resize_map = true;
map_width_meters_ = parameter.as_int();
if (parameter.as_int() > 0) {
resize_map = true;
map_width_meters_ = parameter.as_int();
} else {
RCLCPP_ERROR(
get_logger(), "You try to set width of map to be negative or zero,"
" this isn't allowed, please give a positive value.");
SteveMacenski marked this conversation as resolved.
Show resolved Hide resolved
result.successful = false;
return result;
}
} else if (name == "height") {
resize_map = true;
map_height_meters_ = parameter.as_int();
if (parameter.as_int() > 0) {
resize_map = true;
map_height_meters_ = parameter.as_int();
} else {
RCLCPP_ERROR(
get_logger(), "You try to set height of map to be negative or zero,"
" this isn't allowed, please give a positive value.");
result.successful = false;
return result;
}
}
} else if (type == ParameterType::PARAMETER_STRING) {
if (name == "footprint") {
Expand Down