josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make EncodedString safe to copy

Browse Source
This commit is contained in:
Josh Holtrop 2017-01-21 14:21:51 -05:00
parent 13ca7afd0c
commit fcabf60551
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/EncodedString.cc
View File

@ -29,8 +29,8 @@ EncodedString::EncodedString(const uint8_t * data, size_t size, Encoding::Type e
: m_encoding(encoding), : m_encoding(encoding),
m_size(size) m_size(size)
{ {
m_data = new uint8_t[size]; m_data = std::shared_ptr<uint8_t>(new uint8_t[size], std::default_delete<uint8_t[]>());
memcpy(m_data, data, size); memcpy(&*m_data, data, size);
} }
EncodedString::iterator EncodedString::begin() const EncodedString::iterator EncodedString::begin() const

7
src/core/EncodedString.h
View File

@ -5,6 +5,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <memory>
class EncodedString class EncodedString
{ {
@ -53,11 +54,11 @@ public:
} }
const uint8_t & operator[](size_t index) const const uint8_t & operator[](size_t index) const
{ {
return m_data[index]; return (&*m_data)[index];
} }
bool operator==(const std::string & s) const 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 bool operator!=(const std::string & s) const
{ {
@ -66,7 +67,7 @@ public:
protected: protected:
Encoding::Type m_encoding; Encoding::Type m_encoding;
uint8_t * m_data; std::shared_ptr<uint8_t> m_data;
size_t m_size; size_t m_size;
}; };