Throw exception on null Own<> dereference in debug mode.

1262c429 · Kenton Varda · 83b582ba · 1262c429
Commit 1262c429 authored May 06, 2015 by Kenton Varda
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

memory.h c++/src/kj/memory.h +6 -4

No files found.
--- a/c++/src/kj/memory.h
+++ b/c++/src/kj/memory.h
@@ -165,10 +165,12 @@ public:
    return result;
  }

-  inline T* operator->() { return ptr; }
-  inline const T* operator->() const { return ptr; }
-  inline T& operator*() { return *ptr; }
-  inline const T& operator*() const { return *ptr; }
+#define NULLCHECK KJ_IREQUIRE(ptr != nullptr, "null Own<> dereference")
+  inline T* operator->() { NULLCHECK; return ptr; }
+  inline const T* operator->() const { NULLCHECK; return ptr; }
+  inline T& operator*() { NULLCHECK; return *ptr; }
+  inline const T& operator*() const { NULLCHECK; return *ptr; }
+#undef NULLCHECK
  inline T* get() { return ptr; }
  inline const T* get() const { return ptr; }
  inline operator T*() { return ptr; }