From 661bd5244e7bac741b7bc4e048e552410224a8e4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 6 Aug 2015 23:57:40 +0100
Subject: [PATCH] null checks

---
 ostd/string.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ostd/string.hh b/ostd/string.hh
index 8f8a100..02c2840 100644
--- a/ostd/string.hh
+++ b/ostd/string.hh
@@ -42,7 +42,7 @@ public:
     template<typename U>
     CharRangeBase(U beg, EnableIf<
         IsConvertible<U, T *>::value && !IsArray<U>::value, Nat
-    > = Nat()): p_beg(beg), p_end((T *)beg + strlen(beg)) {}
+    > = Nat()): p_beg(beg), p_end((T *)beg + (beg ? strlen(beg) : 0)) {}
 
     template<typename U, Size N>
     CharRangeBase(U (&beg)[N], EnableIf<
@@ -71,7 +71,7 @@ public:
     }
     /* TODO: traits for utf-16/utf-32 string lengths, for now assume char */
     CharRangeBase &operator=(T *s) {
-        p_beg = s; p_end = s + strlen(s); return *this;
+        p_beg = s; p_end = s + (s ? strlen(s) : 0); return *this;
     }
 
     bool empty() const { return p_beg == p_end; }