From c2410cefbd409082b0b573dde996879564becce8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 19 Mar 2009 14:35:46 -0700 Subject: [PATCH] cstring: don't fall over on null initialization (like std::string does) --- src/include/cstring.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/include/cstring.h b/src/include/cstring.h index c2b1449350d64..eef7cda27716e 100644 --- a/src/include/cstring.h +++ b/src/include/cstring.h @@ -22,10 +22,15 @@ class cstring { _data[l] = 0; } cstring(const char *s) { - _len = strlen(s); - _data = new char[_len + 1]; - memcpy(_data, s, _len); - _data[_len] = 0; + if (s) { + _len = strlen(s); + _data = new char[_len + 1]; + memcpy(_data, s, _len); + _data[_len] = 0; + } else { + _len = 0; + _data = 0; + } } cstring(const string &s) { _len = s.length(); -- 2.39.5