Merge "Prevent calling new ftl::Optional"

1 files changed, 8 insertions, 0 deletions

diff --git a/include/ftl/optional.h b/include/ftl/optional.h
index 7b02bac340..a818128c92 100644
--- a/include/ftl/optional.h
+++ b/include/ftl/optional.h
@@ -95,6 +95,14 @@ struct Optional final : std::optional<T> {
     if (has_value()) return std::invoke(std::forward<F>(f), std::move(value()));
     return R();
   }
+
+  // Delete new for this class. Its base doesn't have a virtual destructor, and
+  // if it got deleted via base class pointer, it would cause undefined
+  // behavior. There's not a good reason to allocate this object on the heap
+  // anyway.
+  static void* operator new(size_t) = delete;
+  static void* operator new[](size_t) = delete;
+
 };
 
 template <typename T, typename U>