add-Wnull-dereference and fix warnings

Signed-off-by: Ryan Friedman <ryanfriedman5410+github@gmail.com>
ros-navigation · Jun 10, 2023 · 63030ae · 63030ae
1 parent 4bbba4b
commit 63030ae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/nav2_common/cmake/nav2_package.cmake b/nav2_common/cmake/nav2_package.cmake
@@ -37,7 +37,7 @@ macro(nav2_package)
   endif()
 
   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC )
+    add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC -Wnull-dereference)
     add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>")
   endif()
 

diff --git a/nav2_costmap_2d/include/nav2_costmap_2d/denoise/image_processing.hpp b/nav2_costmap_2d/include/nav2_costmap_2d/denoise/image_processing.hpp
@@ -999,7 +999,10 @@ class GroupsRemover
     // The group of pixels labeled 0 corresponds to empty map cells.
     // Zero bin of the histogram is equal to the number of pixels in this group.
     // Because the values of empty map cells should not be changed, we will reset this bin
-    groups_sizes.front() = 0;  // don't change image background value
+    if (!groups_sizes.empty()) {
+      groups_sizes.front() = 0;  // don't change image background value
+    }
+
 
     // noise_labels_table[i] = true if group with label i is noise
     std::vector<bool> noise_labels_table(groups_sizes.size());

diff --git a/nav2_mppi_controller/test/critic_manager_test.cpp b/nav2_mppi_controller/test/critic_manager_test.cpp
@@ -65,12 +65,22 @@ class CriticManagerWrapper : public CriticManager
 
   bool getDummyCriticInitialized()
   {
-    return dynamic_cast<DummyCritic *>(critics_[0].get())->initialized_;
+    const auto critic = critics_[0].get();
+    if (critic == nullptr) {
+      return false;
+    }
+    const auto dummy_critic = dynamic_cast<DummyCritic *>(critic);
+    return dummy_critic == nullptr ? false : dummy_critic->initialized_;
   }
 
   bool getDummyCriticScored()
   {
-    return dynamic_cast<DummyCritic *>(critics_[0].get())->scored_;
+    const auto critic = critics_[0].get();
+    if (critic == nullptr) {
+      return false;
+    }
+    const auto dummy_critic = dynamic_cast<DummyCritic *>(critic);
+    return dummy_critic == nullptr ? false : dummy_critic->scored_;
   }
 };