From 01654d97fac5ad5be7d215981e81a606b4878447 Mon Sep 17 00:00:00 2001
From: Eugene Zhulenev <ezhulenev@google.com>
Date: Fri, 17 May 2019 14:02:25 -0700
Subject: [PATCH] Prevent potential division by zero in TensorExecutor

---
 unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h
index d57203ad9..7b5842571 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h
@@ -333,9 +333,9 @@ class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable, /*Tileable*/ tr
           typename TensorBlockMapper::Dimensions(evaluator.dimensions()),
           block_shape, block_size);
       block_size = block_mapper.block_dims_total_size();
+      const size_t align = numext::maxi(EIGEN_MAX_ALIGN_BYTES, 1);
       const size_t aligned_blocksize =
-          EIGEN_MAX_ALIGN_BYTES *
-          divup<size_t>(block_size * sizeof(Scalar), EIGEN_MAX_ALIGN_BYTES);
+          align * divup<size_t>(block_size * sizeof(Scalar), align);
       void* buf = device.allocate((num_threads + 1) * aligned_blocksize);
       device.parallelFor(
           block_mapper.total_block_count(), cost * block_size,