diff --git a/src/core/EncodedString.cc b/src/core/EncodedString.cc index 003a9c5..74f26e1 100644 --- a/src/core/EncodedString.cc +++ b/src/core/EncodedString.cc @@ -23,8 +23,8 @@ EncodedString::EncodedString(const uint8_t * data, size_t size, Encoding::Type e : m_encoding(encoding), m_size(size) { - m_data = std::shared_ptr(new uint8_t[size], std::default_delete()); - memcpy(&*m_data, data, size); + m_data = std::make_shared>(size); + memcpy(&(*m_data)[0], data, size); } EncodedString::iterator EncodedString::begin() const diff --git a/src/core/EncodedString.h b/src/core/EncodedString.h index 0053006..a71ce51 100644 --- a/src/core/EncodedString.h +++ b/src/core/EncodedString.h @@ -6,6 +6,7 @@ #include #include #include +#include class EncodedString { @@ -53,11 +54,11 @@ public: } const uint8_t & operator[](size_t index) const { - return (&*m_data)[index]; + return (*m_data)[index]; } bool operator==(const std::string & s) const { - return (m_size == s.size()) && (memcmp((&*m_data), &s[0], m_size) == 0); + return (m_size == s.size()) && (memcmp(&(*m_data)[0], &s[0], m_size) == 0); } bool operator!=(const std::string & s) const { @@ -66,7 +67,7 @@ public: protected: Encoding::Type m_encoding; - std::shared_ptr m_data; + std::shared_ptr> m_data; size_t m_size; };