commit fba3844b435cceff952567e5bc3f75ed4b096c50
author Sameer Agarwal <sameeragarwal@google.com> Fri Sep 07 17:04:53 2012 -0700
committer ceres-solver code review <noreply-gerritcodereview@google.com> Mon Sep 10 09:28:12 2012 -0700
tree 576cd8e2680a6cfadb0de651345c4143600cdc01
parent ab8e2dc453c0e239c08dd7667a3696d0707b1a6f

Fix two segaults in test code.

Thanks to Sergey Popov for reporting this.

Change-Id: Ib5124a90fc42ae9d7295c04d51a5dd8d16250504

internal/ceres/evaluator_test.cc

diff --git a/internal/ceres/evaluator_test.cc b/internal/ceres/evaluator_test.cc
index 6c8e6f1..a4e7b25 100644
--- a/internal/ceres/evaluator_test.cc
+++ b/internal/ceres/evaluator_test.cc
@@ -818,8 +818,8 @@
                        expected_gradient,
                        expected_jacobian,
                        cost,
-                       &residuals[0],
-                       &gradient[0],
+                       residuals.size() > 0 ? &residuals[0] : NULL,
+                       gradient.size() > 0 ? &gradient[0] : NULL,
                        dense_jacobian.data());
   }
 

internal/ceres/levenberg_marquardt_strategy_test.cc

diff --git a/internal/ceres/levenberg_marquardt_strategy_test.cc b/internal/ceres/levenberg_marquardt_strategy_test.cc
index 6f61dd1..0ce44c4 100644
--- a/internal/ceres/levenberg_marquardt_strategy_test.cc
+++ b/internal/ceres/levenberg_marquardt_strategy_test.cc
@@ -119,7 +119,7 @@
   jacobian(0,2) = 100.0;
 
   double residual = 1.0;
-  double x[2];
+  double x[3];
   DenseSparseMatrix dsm(jacobian);
 
   TrustRegionStrategy::Options options;