ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Base] ByteStream assert cleanup.

This commit is contained in:
gibbed 2021-06-28 12:33:05 -05:00 committed by Rick Gibbed
parent fa8e2ee788
commit f2a68e4b85
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenia/base/byte_stream.cc
View File

@ -20,18 +20,19 @@ ByteStream::ByteStream(uint8_t* data, size_t data_length, size_t offset)
ByteStream::~ByteStream() = default; ByteStream::~ByteStream() = default;
void ByteStream::Advance(size_t num_bytes) { offset_ += num_bytes; } void ByteStream::Advance(size_t num_bytes) {
assert_true(offset_ + num_bytes <= data_length_);
offset_ += num_bytes;
}
void ByteStream::Read(uint8_t* buf, size_t len) { void ByteStream::Read(uint8_t* buf, size_t len) {
assert_true(offset_ < data_length_); assert_true(offset_ + len <= data_length_);
std::memcpy(buf, data_ + offset_, len); std::memcpy(buf, data_ + offset_, len);
Advance(len); Advance(len);
} }
void ByteStream::Write(const uint8_t* buf, size_t len) { void ByteStream::Write(const uint8_t* buf, size_t len) {
assert_true(offset_ < data_length_); assert_true(offset_ + len <= data_length_);
std::memcpy(data_ + offset_, buf, len); std::memcpy(data_ + offset_, buf, len);
Advance(len); Advance(len);
} }
@ -41,7 +42,6 @@ std::string ByteStream::Read() {
std::string str; std::string str;
uint32_t len = Read<uint32_t>(); uint32_t len = Read<uint32_t>();
str.resize(len); str.resize(len);
Read(reinterpret_cast<uint8_t*>(&str[0]), len); Read(reinterpret_cast<uint8_t*>(&str[0]), len);
return str; return str;
} }
@ -49,9 +49,8 @@ std::string ByteStream::Read() {
template <> template <>
std::u16string ByteStream::Read() { std::u16string ByteStream::Read() {
std::u16string str; std::u16string str;
uint32_t len = Read<uint32_t>(); size_t len = Read<uint32_t>();
str.resize(len); str.resize(len);
Read(reinterpret_cast<uint8_t*>(&str[0]), len * 2); Read(reinterpret_cast<uint8_t*>(&str[0]), len * 2);
return str; return str;
} }