drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 8 Activity

[ox/std] Ensure ox::String always has at least a null terminator

Browse Source
This commit is contained in:
Gary Talent 2024-05-29 02:15:30 -05:00
parent 2761f23d31
commit 67cf3ae837
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deps/ox/src/ox/std/string.hpp vendored
View File

@ -30,7 +30,7 @@ constexpr ox::IString<21> itoa(Integer v) noexcept;
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
class BasicString { class BasicString {
private: private:
Vector<char, SmallStringSize_v> m_buff; Vector<char, SmallStringSize_v> m_buff{1};
public: public:
static constexpr auto SmallStringSize = SmallStringSize_v; static constexpr auto SmallStringSize = SmallStringSize_v;
@ -248,21 +248,10 @@ class BasicString {
}; };
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v>::BasicString() noexcept { constexpr BasicString<SmallStringSize_v>::BasicString() noexcept = default;
if (!m_buff.empty()) {
m_buff[0] = 0;
} else {
m_buff.push_back(0);
}
}
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v>::BasicString(std::size_t cap) noexcept: m_buff(cap + 1) { constexpr BasicString<SmallStringSize_v>::BasicString(std::size_t cap) noexcept: m_buff(cap + 1) {}
// GCC complains if you don't do this pretty unnecessary size check
if (!m_buff.empty()) {
m_buff[0] = 0;
}
}
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v>::BasicString(const char *str) noexcept { constexpr BasicString<SmallStringSize_v>::BasicString(const char *str) noexcept {
@ -313,6 +302,7 @@ constexpr BasicString<SmallStringSize_v>::BasicString(const BasicString &other)
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v>::BasicString(BasicString &&other) noexcept: m_buff(std::move(other.m_buff)) { constexpr BasicString<SmallStringSize_v>::BasicString(BasicString &&other) noexcept: m_buff(std::move(other.m_buff)) {
other.m_buff.push_back(0);
} }
template<std::size_t SmallStringSize_v> template<std::size_t SmallStringSize_v>
@ -358,6 +348,7 @@ template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(BasicString &&src) noexcept { constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(BasicString &&src) noexcept {
if (this != &src) { if (this != &src) {
m_buff = std::move(src.m_buff); m_buff = std::move(src.m_buff);
src.m_buff.push_back(0);
} }
return *this; return *this;
} }