From f19bb4fe6d1de14f9539768ad9a67391fc52ed87 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 1 Jun 2015 19:06:35 +0100 Subject: Port more code to use the format function instead of adhoc string concat --- src/string.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/string.hh') diff --git a/src/string.hh b/src/string.hh index 2108c64e..5d3855f1 100644 --- a/src/string.hh +++ b/src/string.hh @@ -132,7 +132,7 @@ public: constexpr StringView() = default; constexpr StringView(const char* data, ByteCount length) : m_data{data}, m_length{length} {} - constexpr StringView(const char* data) : m_data{data}, m_length{strlen(data)} {} + constexpr StringView(const char* data) : m_data{data}, m_length{data ? strlen(data) : 0} {} constexpr StringView(const char* begin, const char* end) : m_data{begin}, m_length{(int)(end - begin)} {} StringView(const String& str) : m_data{str.data()}, m_length{(int)str.length()} {} StringView(const char& c) : m_data(&c), m_length(1) {} -- cgit v1.2.3