rexy712/rexylib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix string 0 length segfault. Bring binary ctor/assignment up to par with strings

Browse Source
This commit is contained in:
rexy712 2020-07-17 15:48:56 -07:00
parent 8c783c48fa
commit b1c2d260ee
3 changed files with 84 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/rexy/binary.hpp
View File

@ -42,7 +42,7 @@ namespace rexy{
protected: protected:
constexpr binary_base(void)noexcept = default; constexpr binary_base(void)noexcept = default;
constexpr binary_base(char* data, size_t size)noexcept; constexpr binary_base(char* data, size_t size)noexcept;
constexpr binary_base(char* data, size_t cap, size_t size)noexcept; constexpr binary_base(char* data, size_t size, size_t cap)noexcept;
constexpr binary_base(const binary_base& b)noexcept; constexpr binary_base(const binary_base& b)noexcept;
~binary_base(void)noexcept = default; ~binary_base(void)noexcept = default;
@ -65,25 +65,27 @@ namespace rexy{
public: public:
using allocator_type = Allocator; using allocator_type = Allocator;
public: public:
constexpr binary_data(void)noexcept = default; constexpr binary_data(void)noexcept;
binary_data(const char* data, size_t size)
noexcept(noexcept(Allocator::copy(data, size)));
explicit binary_data(const char* data)
noexcept(noexcept(Allocator::copy(data, 0)));
constexpr binary_data(rexy::steal<char*> data, size_t size)noexcept; constexpr binary_data(rexy::steal<char*> data, size_t size)noexcept;
constexpr binary_data(rexy::steal<char*> data, size_t cap, size_t size)noexcept; constexpr binary_data(rexy::steal<char*> data, size_t cap, size_t size)noexcept;
binary_data(const char* data, size_t cap, size_t size) constexpr binary_data(rexy::steal<char*> data)noexcept;
noexcept(noexcept(Allocator::copy(data, size))); binary_data(const char* data, size_t size)noexcept(noexcept(Allocator::copy(data, size)));
binary_data(size_t size) binary_data(const char* data)noexcept(noexcept(Allocator::copy(data, 0)));
noexcept(noexcept(Allocator::allocate(size))); binary_data(const char* data, size_t size, size_t cap)noexcept(noexcept(Allocator::copy(data, size)));
binary_data(const binary_data& b) explicit binary_data(size_t size)noexcept(noexcept(Allocator::allocate(size)));
noexcept(noexcept(Allocator::copy(b.m_data, b.m_cap))); binary_data(size_t size, size_t cap)noexcept(noexcept(Allocator::allocate(size)));
binary_data(const binary_data& b)noexcept(noexcept(Allocator::copy(b.m_data, b.m_cap)));
constexpr binary_data(binary_data&& b)noexcept; constexpr binary_data(binary_data&& b)noexcept;
~binary_data(void) binary_data(const binary_base& b)noexcept(noexcept(Allocator::copy(b.get(),b.size())));
noexcept(noexcept(Allocator::free(m_data)));
binary_data& operator=(const binary_data& b) ~binary_data(void)noexcept(noexcept(Allocator::free(m_data)));
noexcept(noexcept(Allocator::copy(b.m_data, b.m_size)));
binary_data& operator=(const binary_data& b)noexcept(noexcept(Allocator::copy(b.m_data, b.m_size)));
constexpr binary_data& operator=(binary_data&& b)noexcept; constexpr binary_data& operator=(binary_data&& b)noexcept;
binary_data& operator=(const char* c)noexcept(noexcept(Allocator::copy(c, 0)));
binary_data& operator=(const binary_base& b)noexcept(noexcept(Allocator::copy(b.get(), b.size())));
void reset(void) void reset(void)
noexcept(noexcept(Allocator::free(m_data))); noexcept(noexcept(Allocator::free(m_data)));
void reset(char* val, size_t cap, size_t size = 0) void reset(char* val, size_t cap, size_t size = 0)
@ -94,6 +96,10 @@ namespace rexy{
void append(const char* data, size_t len) void append(const char* data, size_t len)
noexcept(noexcept(Allocator::allocate(0)) && noexcept(noexcept(Allocator::allocate(0)) &&
noexcept(Allocator::free(nullptr))); noexcept(Allocator::free(nullptr)));
private:
binary_data& _copy_data(const char* data, size_t len)
noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)));
}; };
using binary = binary_data<>; using binary = binary_data<>;

74
include/rexy/binary.tpp
View File

@ -28,13 +28,15 @@
#include "steal.hpp" #include "steal.hpp"
#include "detail/string_appender.hpp" #include "detail/string_appender.hpp"
#include "cx/utility.hpp" //strlen
#define STOP_STRICT_ALIAS_WARNING(x) (x) #define STOP_STRICT_ALIAS_WARNING(x) (x)
namespace rexy{ namespace rexy{
constexpr binary_base::binary_base(char* data, size_t size)noexcept: constexpr binary_base::binary_base(char* data, size_t size)noexcept:
m_data(data), m_cap(size){} m_data(data), m_cap(size){}
constexpr binary_base::binary_base(char* data, size_t cap, size_t size)noexcept: constexpr binary_base::binary_base(char* data, size_t size, size_t cap)noexcept:
m_data(data), m_size(size), m_cap(cap){} m_data(data), m_size(size), m_cap(cap){}
constexpr binary_base::binary_base(const binary_base&)noexcept{} constexpr binary_base::binary_base(const binary_base&)noexcept{}
@ -65,6 +67,22 @@ namespace rexy{
return m_data[i]; return m_data[i];
} }
template<class Allocator>
constexpr binary_data<Allocator>::binary_data(void)noexcept{}
template<class Allocator>
constexpr binary_data<Allocator>::binary_data(rexy::steal<char*> data)noexcept:
binary_base(data.value() ? cx::strlen(data.value()) : 0)
{
m_data = data.value();
m_size = m_cap;
}
template<class Allocator>
constexpr binary_data<Allocator>::binary_data(rexy::steal<char*> data, size_t size)noexcept:
binary_base(data.value(), size){}
template<class Allocator>
constexpr binary_data<Allocator>::binary_data(rexy::steal<char*> data, size_t cap, size_t size)noexcept:
binary_base(data.value(), cap, size){}
template<class Allocator> template<class Allocator>
binary_data<Allocator>::binary_data(const char* data, size_t size) binary_data<Allocator>::binary_data(const char* data, size_t size)
noexcept(noexcept(Allocator::copy(data, size))): noexcept(noexcept(Allocator::copy(data, size))):
@ -74,29 +92,27 @@ namespace rexy{
noexcept(noexcept(Allocator::copy(data, 0))): noexcept(noexcept(Allocator::copy(data, 0))):
binary_data(data, cx::strlen(data)){} binary_data(data, cx::strlen(data)){}
template<class Allocator> template<class Allocator>
constexpr binary_data<Allocator>::binary_data(rexy::steal<char*> data, size_t size)noexcept: binary_data<Allocator>::binary_data(const char* data, size_t size, size_t cap)
binary_base(data.value(), size){}
template<class Allocator>
constexpr binary_data<Allocator>::binary_data(rexy::steal<char*> data, size_t cap, size_t size)noexcept:
binary_base(data.value(), cap, size){}
template<class Allocator>
binary_data<Allocator>::binary_data(const char* data, size_t cap, size_t size)
noexcept(noexcept(Allocator::copy(data, size))): noexcept(noexcept(Allocator::copy(data, size))):
binary_base(reinterpret_cast<char*>(Allocator::copy(data, size)), cap, size){} binary_base(reinterpret_cast<char*>(Allocator::copy(data, size)), size, cap){}
template<class Allocator> template<class Allocator>
binary_data<Allocator>::binary_data(size_t size) binary_data<Allocator>::binary_data(size_t size)
noexcept(noexcept(Allocator::allocate(size))): noexcept(noexcept(Allocator::allocate(size))):
binary_base(reinterpret_cast<char*>(Allocator::allocate(size)), size){} binary_base(reinterpret_cast<char*>(Allocator::allocate(size)), size){}
template<class Allocator> template<class Allocator>
binary_data<Allocator>::binary_data(size_t size, size_t cap)
noexcept(noexcept(Allocator::allocate(size))):
binary_base(reinterpret_cast<char*>(size ? Allocator::allocate(size) : nullptr), size, cap){}
template<class Allocator>
binary_data<Allocator>::binary_data(const binary_data& b) binary_data<Allocator>::binary_data(const binary_data& b)
noexcept(noexcept(Allocator::copy(b.m_data, b.m_cap))): noexcept(noexcept(Allocator::copy(b.m_data, b.m_cap))):
binary_base(b.m_data, b.m_cap, b.m_size) binary_base(reinterpret_cast<char*>(b.m_size ? Allocator::copy(b.m_data, b.m_size) : nullptr), b.m_size, b.m_size){}
{
m_data = Allocator::copy(b.m_data, b.m_cap);
}
template<class Allocator> template<class Allocator>
constexpr binary_data<Allocator>::binary_data(binary_data&& b)noexcept: constexpr binary_data<Allocator>::binary_data(binary_data&& b)noexcept:
binary_base(cx::exchange(b.m_data, nullptr), b.m_cap, b.m_size){} binary_base(cx::exchange(b.m_data, nullptr), b.m_size, b.m_cap){}
template<class Allocator>
binary_data<Allocator>::binary_data(const binary_base& b)noexcept(noexcept(Allocator::copy(b.get(),b.size()))):
binary_base(reinterpret_cast<char*>(b.size() ? Allocator::copy(b.get(), b.size()) : nullptr), b.size(), b.size()){}
template<class Allocator> template<class Allocator>
binary_data<Allocator>::~binary_data(void) binary_data<Allocator>::~binary_data(void)
noexcept(noexcept(Allocator::free(m_data))) noexcept(noexcept(Allocator::free(m_data)))
@ -107,8 +123,7 @@ namespace rexy{
binary_data<Allocator>& binary_data<Allocator>::operator=(const binary_data& b) binary_data<Allocator>& binary_data<Allocator>::operator=(const binary_data& b)
noexcept(noexcept(Allocator::copy(b.m_data, b.m_size))) noexcept(noexcept(Allocator::copy(b.m_data, b.m_size)))
{ {
binary_data<allocator_type> tmp(b); return _copy_data(b.get(), b.size());
return (*this = std::move(tmp));
} }
template<class Allocator> template<class Allocator>
constexpr binary_data<Allocator>& binary_data<Allocator>::operator=(binary_data&& b)noexcept{ constexpr binary_data<Allocator>& binary_data<Allocator>::operator=(binary_data&& b)noexcept{
@ -118,6 +133,18 @@ namespace rexy{
return *this; return *this;
} }
template<class Allocator> template<class Allocator>
binary_data<Allocator>& binary_data<Allocator>::operator=(const char* c)
noexcept(noexcept(Allocator::copy(c, 0)))
{
return _copy_data(c, strlen(c));
}
template<class Allocator>
binary_data<Allocator>& binary_data<Allocator>::operator=(const binary_base& b)
noexcept(noexcept(Allocator::copy(b.m_data, b.m_size)))
{
return _copy_data(b.get(), b.size());
}
template<class Allocator>
void binary_data<Allocator>::reset(void) void binary_data<Allocator>::reset(void)
noexcept(noexcept(Allocator::free(m_data))) noexcept(noexcept(Allocator::free(m_data)))
{ {
@ -159,6 +186,21 @@ namespace rexy{
memcpy(m_data+m_size, data, len); memcpy(m_data+m_size, data, len);
m_size += len; m_size += len;
} }
template<class Allocator>
binary_data<Allocator>& binary_data<Allocator>::_copy_data(const char* data, size_t len)
noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr)))
{
if(!len)
return (*this = binary_data(rexy::steal<char*>(nullptr), 0, 0));
if(len <= m_size){
m_size = len;
memcpy(m_data, data, len);
return *this;
}
return (*this = binary_data(data, len));
}
constexpr static_binary::static_binary(const char* str, size_t len)noexcept: constexpr static_binary::static_binary(const char* str, size_t len)noexcept:
binary_base(const_cast<char*>(str), len, len){} binary_base(const_cast<char*>(str), len, len){}
constexpr static_binary::static_binary(const char* str)noexcept: constexpr static_binary::static_binary(const char* str)noexcept:

6
include/rexy/string_base.tpp
View File

@ -81,7 +81,7 @@ namespace rexy{
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>::string_intermediary(const string_intermediary& b) string_intermediary<Allocator>::string_intermediary(const string_intermediary& b)
noexcept(noexcept(Allocator::copy(b.m_data, b.m_length))): noexcept(noexcept(Allocator::copy(b.m_data, b.m_length))):
string_base(reinterpret_cast<char*>(b.m_length ? Allocator::copy(b.m_data, b.m_length+1) : nullptr), b.m_length, b.m_cap){} string_base(reinterpret_cast<char*>(b.m_length ? Allocator::copy(b.m_data, b.m_length+1) : nullptr), b.m_length, b.m_length){}
template<class Allocator> template<class Allocator>
constexpr string_intermediary<Allocator>::string_intermediary(string_intermediary&& s) constexpr string_intermediary<Allocator>::string_intermediary(string_intermediary&& s)
noexcept(noexcept(cx::exchange(s.m_data, nullptr))): noexcept(noexcept(cx::exchange(s.m_data, nullptr))):
@ -90,7 +90,7 @@ namespace rexy{
template<class Allocator> template<class Allocator>
string_intermediary<Allocator>::string_intermediary(const string_base& b) string_intermediary<Allocator>::string_intermediary(const string_base& b)
noexcept(noexcept(Allocator::copy(b.get(), b.length()))): noexcept(noexcept(Allocator::copy(b.get(), b.length()))):
string_base(reinterpret_cast<char*>(b.length() ? Allocator::copy(b.get(), b.length()+1) : nullptr), b.length(), b.capacity()){} string_base(reinterpret_cast<char*>(b.length() ? Allocator::copy(b.get(), b.length()+1) : nullptr), b.length(), b.length()){}
//dtor //dtor
template<class Allocator> template<class Allocator>
@ -207,6 +207,8 @@ namespace rexy{
noexcept(noexcept(Allocator::copy(nullptr,0)) && noexcept(noexcept(Allocator::copy(nullptr,0)) &&
noexcept(Allocator::free(nullptr))) noexcept(Allocator::free(nullptr)))
{ {
if(!len)
return (*this = string_intermediary(rexy::steal<char*>(nullptr), 0, 0));
if(len <= m_length){ if(len <= m_length){
m_length = len; m_length = len;
memcpy(m_data, s, len); memcpy(m_data, s, len);