From 6e42a8098cea9bed707b6b2a1d3001cabf36fc1d Mon Sep 17 00:00:00 2001
From: Dillon <dsharlet@gmail.com>
Date: Fri, 15 Dec 2023 08:50:26 -0800
Subject: [PATCH] Avoid incrementing (but not dereferencing) null pointers

---
 include/array/array.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/array/array.h b/include/array/array.h
index 19999f0..98f9853 100644
--- a/include/array/array.h
+++ b/include/array/array.h
@@ -1679,6 +1679,10 @@ template <class Shape, class Ptr, class Fn,
     class = internal::enable_if_callable<Fn, typename std::remove_pointer<Ptr>::type&>>
 NDARRAY_UNIQUE NDARRAY_HOST_DEVICE void for_each_value_in_order(
     const Shape& shape, Ptr base, Fn&& fn) {
+  if (!base) {
+    assert(shape.empty());
+    return;
+  }
   // TODO: This is losing compile-time constant extents and strides info
   // (https://github.com/dsharlet/array/issues/1).
   auto base_and_stride = std::make_pair(base, shape.stride());
@@ -1698,6 +1702,10 @@ template <class Shape, class ShapeA, class PtrA, class ShapeB, class PtrB, class
         typename std::remove_pointer<PtrB>::type&>>
 NDARRAY_UNIQUE NDARRAY_HOST_DEVICE void for_each_value_in_order(const Shape& shape,
     const ShapeA& shape_a, PtrA base_a, const ShapeB& shape_b, PtrB base_b, Fn&& fn) {
+  if (!base_a || !base_b) {
+    assert(shape.empty());
+    return;
+  }
   base_a += shape_a[shape.min()];
   base_b += shape_b[shape.min()];
   // TODO: This is losing compile-time constant extents and strides info