From 52edc1cc02747f23983304996cc236636bb533ab Mon Sep 17 00:00:00 2001
From: Gaurav Jain <gjn@google.com>
Date: Fri, 3 Apr 2020 16:28:35 -0700
Subject: [PATCH] Return an error if we cannot create a tensor

PiperOrigin-RevId: 304715417
Change-Id: If41b187af1b38311c6d5e462ae9a2e4d420dd15b
---
 tensorflow/python/lib/core/py_seq_tensor.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tensorflow/python/lib/core/py_seq_tensor.cc b/tensorflow/python/lib/core/py_seq_tensor.cc
index 6629a58577b..f01c33fea36 100644
--- a/tensorflow/python/lib/core/py_seq_tensor.cc
+++ b/tensorflow/python/lib/core/py_seq_tensor.cc
@@ -288,8 +288,14 @@ struct Converter {
       Py_DECREF(scalar);
       if (*error != nullptr) return errors::InvalidArgument(*error);
       t = ConverterTraits<T>::CreateScalar(ctx, value);
+      if (t == nullptr) {
+        return errors::Internal("Cannot create tensor.");
+      }
     } else {
       t = ConverterTraits<T>::CreateTensor(ctx, state->inferred_shape);
+      if (t == nullptr) {
+        return errors::Internal("Cannot create tensor.");
+      }
       if (t->NumElements() > 0) {
         T* buf = static_cast<T*>(t->Data());
         *error = Helper(obj, 0, state, &buf);