diff --git a/src/core/EncodedString.cc b/src/core/EncodedString.cc
index 8e75268..9b1c414 100644
--- a/src/core/EncodedString.cc
+++ b/src/core/EncodedString.cc
@@ -29,8 +29,8 @@ EncodedString::EncodedString(const uint8_t * data, size_t size, Encoding::Type e
     : m_encoding(encoding),
       m_size(size)
 {
-    m_data = new uint8_t[size];
-    memcpy(m_data, data, size);
+    m_data = std::shared_ptr<uint8_t>(new uint8_t[size], std::default_delete<uint8_t[]>());
+    memcpy(&*m_data, data, size);
 }
 
 EncodedString::iterator EncodedString::begin() const
diff --git a/src/core/EncodedString.h b/src/core/EncodedString.h
index 0e4557f..f652f22 100644
--- a/src/core/EncodedString.h
+++ b/src/core/EncodedString.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <string>
+#include <memory>
 
 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), &s[0], m_size) == 0);
     }
     bool operator!=(const std::string & s) const
     {
@@ -66,7 +67,7 @@ public:
 
 protected:
     Encoding::Type m_encoding;
-    uint8_t * m_data;
+    std::shared_ptr<uint8_t> m_data;
     size_t m_size;
 };