From 708090d48995456bfa66615398d8c56dadebe018 Mon Sep 17 00:00:00 2001
From: James Ring <sjr@google.com>
Date: Fri, 18 Jan 2019 15:59:16 -0800
Subject: [PATCH] Make TF_DeleteKernelBuilder not crash on nullptr.

After this change, TF_DeleteKernelBuilder will comply with the
conventions established in c_api.h, namely that *Delete* functions are
safe with nullptr parameters.

PiperOrigin-RevId: 230009727
---
 tensorflow/c/kernels.cc      | 7 ++++---
 tensorflow/c/kernels_test.cc | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/c/kernels.cc b/tensorflow/c/kernels.cc
index c45efd7fae2..9505bf9dda3 100644
--- a/tensorflow/c/kernels.cc
+++ b/tensorflow/c/kernels.cc
@@ -48,9 +48,10 @@ TF_KernelBuilder* TF_NewKernelBuilder(
 }
 
 void TF_DeleteKernelBuilder(TF_KernelBuilder* builder) {
-  DCHECK_NE(builder, nullptr);
-  delete builder->cc_builder;
-  delete builder;
+  if (builder != nullptr) {
+    delete builder->cc_builder;
+    delete builder;
+  }
 }
 
 namespace tensorflow {
diff --git a/tensorflow/c/kernels_test.cc b/tensorflow/c/kernels_test.cc
index 531eb598fa8..0d2954717e7 100644
--- a/tensorflow/c/kernels_test.cc
+++ b/tensorflow/c/kernels_test.cc
@@ -224,4 +224,8 @@ TEST(TestKernel, TestInputAndOutputCount) {
   }
 }
 
+TEST(TestKernel, DeleteKernelBuilderIsOkOnNull) {
+  TF_DeleteKernelBuilder(nullptr);
+}
+
 }  // namespace tensorflow