Fix potential issue with null pointer access

Desbordante · Dec 18, 2022 · 5431d28 · 5431d28
1 parent 0615b6a
commit 5431d28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/algorithms/metric/metric_verifier.cpp b/src/algorithms/metric/metric_verifier.cpp
@@ -175,7 +175,6 @@ unsigned long long MetricVerifier::ExecuteInternal() {
     points_calculator_ = std::make_unique<PointsCalculator>(dist_from_null_is_infinity_,
                                                             typed_relation_, rhs_indices_);
     highlight_calculator_ = std::make_unique<HighlightCalculator>(typed_relation_, rhs_indices_);
-    assert(points_calculator_.get() != nullptr || highlight_calculator_.get() != nullptr);
 
     VerifyMetricFD();
 

diff --git a/src/algorithms/metric/metric_verifier.h b/src/algorithms/metric/metric_verifier.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cassert>
 #include <cstddef>
 #include <filesystem>
 #include <functional>
@@ -104,6 +105,7 @@ class MetricVerifier : public algos::Primitive {
     }
 
     std::vector<std::vector<Highlight>> const& GetHighlights() const {
+        assert(highlight_calculator_);
         return highlight_calculator_->GetHighlights();
     }
 
@@ -112,21 +114,27 @@ class MetricVerifier : public algos::Primitive {
     }
 
     void SortHighlightsByDistanceAscending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByDistanceAscending();
     }
     void SortHighlightsByDistanceDescending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByDistanceDescending();
     }
     void SortHighlightsByFurthestIndexAscending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByFurthestIndexAscending();
     }
     void SortHighlightsByFurthestIndexDescending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByFurthestIndexDescending();
     }
     void SortHighlightsByIndexAscending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByIndexAscending();
     }
     void SortHighlightsByIndexDescending() {
+        assert(highlight_calculator_);
         highlight_calculator_->SortHighlightsByIndexDescending();
     }