From: A. Unique TensorFlower <gardener@tensorflow.org>
Date: Mon, 5 Feb 2018 20:16:04 +0000 (-0800)
Subject: Bug fix: Don't dereference nullptr in OpKernelContext::input_alloc_attr().
X-Git-Tag: upstream/v1.7.0~31^2~1006
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc8d9c38692d3dddf474dba7e43c666105c08a3d;p=platform%2Fupstream%2Ftensorflow.git

Bug fix: Don't dereference nullptr in OpKernelContext::input_alloc_attr().

PiperOrigin-RevId: 184566770
---

diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index a3dc96b..c45026c 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -909,9 +909,13 @@ class OpKernelContext {
   }
 
   AllocatorAttributes input_alloc_attr(int index) const {
-    DCHECK_GE(index, 0);
-    DCHECK_LT(index, params_->input_alloc_attrs->size());
-    return (*params_->input_alloc_attrs)[index];
+    if (params_->input_alloc_attrs == nullptr) {
+      return AllocatorAttributes();
+    } else {
+      DCHECK_GE(index, 0);
+      DCHECK_LT(index, params_->input_alloc_attrs->size());
+      return (*params_->input_alloc_attrs)[index];
+    }
   }
 
   AllocatorAttributes output_alloc_attr(int index) const {