From 408e638c396013cfc80e70335396e45c3432d5a8 Mon Sep 17 00:00:00 2001
From: Yihua Xu <yihua.xu@intel.com>
Date: Sat, 30 Nov 2019 21:32:41 +0800
Subject: [PATCH] Fix the crash issue when scale or bias was null-pointer.
 (#21284) (#21444)

* Fix the crash issue when scale or bias was null-pointer.

* Add the error message for passing CI.

test=release/1.6
---
 paddle/fluid/operators/layer_norm_op.h | 30 ++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/paddle/fluid/operators/layer_norm_op.h b/paddle/fluid/operators/layer_norm_op.h
index db794ed4211..9bea7018742 100644
--- a/paddle/fluid/operators/layer_norm_op.h
+++ b/paddle/fluid/operators/layer_norm_op.h
@@ -224,17 +224,35 @@ class LayerNormKernel : public framework::OpKernel<T> {
           ctx, &out, bias, /*axis*/ 1, AddFunctor<T>(), &out);
     }
 #else
-    PADDLE_ENFORCE_EQ(mean->numel(), left);
-    PADDLE_ENFORCE_EQ(var->numel(), left);
-    PADDLE_ENFORCE_EQ(scale->numel(), right);
-    PADDLE_ENFORCE_EQ(bias->numel(), right);
+    PADDLE_ENFORCE_EQ(mean->numel(), left,
+                      platform::errors::InvalidArgument(
+                          "mean's length (%d) is not equal with expected (%d).",
+                          mean->numel(), left));
+    PADDLE_ENFORCE_EQ(var->numel(), left,
+                      platform::errors::InvalidArgument(
+                          "var's length (%d) is not equal with expected (%d).",
+                          var->numel(), left));
+    if (scale) {
+      PADDLE_ENFORCE_EQ(
+          scale->numel(), right,
+          platform::errors::InvalidArgument(
+              "scale's length (%d) is not equal with expected (%d).",
+              scale->numel(), right));
+    }
+    if (bias) {
+      PADDLE_ENFORCE_EQ(
+          bias->numel(), right,
+          platform::errors::InvalidArgument(
+              "bias's length (%d) is not equal with expected (%d).",
+              bias->numel(), right));
+    }
 
     auto ker =
         jit::KernelFuncs<jit::LayerNormTuple<T>, platform::CPUPlace>::Cache()
             .At(right);
     ker(x.data<T>(), out.data<T>(), mean->data<T>(), var->data<T>(),
-        scale->data<T>(), bias->data<T>(), static_cast<int>(left),
-        static_cast<const float>(epsilon), right);
+        scale ? scale->data<T>() : nullptr, bias ? bias->data<T>() : nullptr,
+        static_cast<int>(left), static_cast<const float>(epsilon), right);
 #endif
   }
 };
-- 
GitLab