From fba3844b435cceff952567e5bc3f75ed4b096c50 Mon Sep 17 00:00:00 2001
From: Sameer Agarwal <sameeragarwal@google.com>
Date: Fri, 7 Sep 2012 17:04:53 -0700
Subject: [PATCH] Fix two segaults in test code.

Thanks to Sergey Popov for reporting this.

Change-Id: Ib5124a90fc42ae9d7295c04d51a5dd8d16250504
---
 internal/ceres/evaluator_test.cc                    | 4 ++--
 internal/ceres/levenberg_marquardt_strategy_test.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/ceres/evaluator_test.cc b/internal/ceres/evaluator_test.cc
index 6c8e6f165..a4e7b2540 100644
--- a/internal/ceres/evaluator_test.cc
+++ b/internal/ceres/evaluator_test.cc
@@ -818,8 +818,8 @@ class StaticEvaluateTest : public ::testing::Test {
                        expected_gradient,
                        expected_jacobian,
                        cost,
-                       &residuals[0],
-                       &gradient[0],
+                       residuals.size() > 0 ? &residuals[0] : NULL,
+                       gradient.size() > 0 ? &gradient[0] : NULL,
                        dense_jacobian.data());
   }
 
diff --git a/internal/ceres/levenberg_marquardt_strategy_test.cc b/internal/ceres/levenberg_marquardt_strategy_test.cc
index 6f61dd1de..0ce44c436 100644
--- a/internal/ceres/levenberg_marquardt_strategy_test.cc
+++ b/internal/ceres/levenberg_marquardt_strategy_test.cc
@@ -119,7 +119,7 @@ TEST(LevenbergMarquardtStrategy, CorrectDiagonalToLinearSolver) {
   jacobian(0,2) = 100.0;
 
   double residual = 1.0;
-  double x[2];
+  double x[3];
   DenseSparseMatrix dsm(jacobian);
 
   TrustRegionStrategy::Options options;