From 236a84c5050d419285cb7fbcc9c8f5bf923058ab Mon Sep 17 00:00:00 2001
From: wanghaoshuang <wanghaoshuang@baidu.com>
Date: Wed, 13 Sep 2017 11:09:01 +0800
Subject: [PATCH] Fix nullptr check

---
 paddle/operators/pad_op.cc |  5 +++--
 paddle/operators/pad_op.h  | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/paddle/operators/pad_op.cc b/paddle/operators/pad_op.cc
index 99f605c651d..7e78b6ec133 100644
--- a/paddle/operators/pad_op.cc
+++ b/paddle/operators/pad_op.cc
@@ -96,8 +96,9 @@ class PadOpGrad : public framework::OperatorWithKernel {
                             "Input(Out@GRAD) should not be null");
     auto x_dims = ctx.Input<Tensor>("X")->dims();
     auto *x_grad = ctx.Output<Tensor>(framework::GradVarName("X"));
-
-    x_grad->Resize(x_dims);
+    if (x_grad != nullptr) {
+      x_grad->Resize(x_dims);
+    }
   }
 };
 
diff --git a/paddle/operators/pad_op.h b/paddle/operators/pad_op.h
index ca8832f26a6..2cc3b945ae5 100644
--- a/paddle/operators/pad_op.h
+++ b/paddle/operators/pad_op.h
@@ -87,12 +87,13 @@ void PadGradFunction(const framework::ExecutionContext& context) {
   }
   auto* d_out = context.Input<Tensor>(framework::GradVarName("Out"));
   auto* d_x = context.Output<Tensor>(framework::GradVarName("X"));
-  d_x->mutable_data<T>(context.GetPlace());
-
-  auto d_x_tensor = EigenTensor<T, D>::From(*d_x);
-  auto d_out_tensor = EigenTensor<T, D>::From(*d_out);
-  auto place = context.GetEigenDevice<Place>();
-  d_x_tensor.device(place) = d_out_tensor.pad(paddings, 0);
+  if (d_x != nullptr) {
+    d_x->mutable_data<T>(context.GetPlace());
+    auto d_x_tensor = EigenTensor<T, D>::From(*d_x);
+    auto d_out_tensor = EigenTensor<T, D>::From(*d_out);
+    auto place = context.GetEigenDevice<Place>();
+    d_x_tensor.device(place) = d_out_tensor.pad(paddings, 0);
+  }
 }
 
 template <typename Place, typename T>
-- 
GitLab