Add clamping to IBStream implementation seek

This commit is contained in:
Robbert van der Helm
2021-04-29 23:38:35 +02:00
parent cb07fd07a2
commit 0536256217
2 changed files with 10 additions and 7 deletions
+9 -6
View File
@@ -139,8 +139,9 @@ tresult PLUGIN_API YaBStream::read(void* buffer,
return Steinberg::kInvalidArgument; return Steinberg::kInvalidArgument;
} }
size_t bytes_to_read = std::min(static_cast<size_t>(numBytes), const int64_t bytes_to_read =
this->buffer.size() - seek_position); std::min(static_cast<int64_t>(numBytes),
static_cast<int64_t>(this->buffer.size()) - seek_position);
std::copy_n(&this->buffer[seek_position], bytes_to_read, std::copy_n(&this->buffer[seek_position], bytes_to_read,
reinterpret_cast<uint8_t*>(buffer)); reinterpret_cast<uint8_t*>(buffer));
@@ -160,12 +161,12 @@ tresult PLUGIN_API YaBStream::write(void* buffer,
return Steinberg::kInvalidArgument; return Steinberg::kInvalidArgument;
} }
if (seek_position + numBytes > this->buffer.size()) { if (seek_position + numBytes > static_cast<int64_t>(this->buffer.size())) {
this->buffer.resize(seek_position + numBytes); this->buffer.resize(seek_position + numBytes);
} }
std::copy_n(reinterpret_cast<uint8_t*>(buffer), numBytes, std::copy_n(reinterpret_cast<uint8_t*>(buffer), numBytes,
this->buffer.begin() + static_cast<int>(seek_position)); &this->buffer[seek_position]);
seek_position += numBytes; seek_position += numBytes;
if (numBytesWritten) { if (numBytesWritten) {
@@ -184,13 +185,15 @@ tresult PLUGIN_API YaBStream::seek(int64 pos, int32 mode, int64* result) {
seek_position += pos; seek_position += pos;
break; break;
case kIBSeekEnd: case kIBSeekEnd:
seek_position = this->buffer.size() + pos; seek_position = static_cast<int64_t>(buffer.size()) + pos;
break; break;
default: default:
return Steinberg::kInvalidArgument; return Steinberg::kInvalidArgument;
break; break;
} }
seek_position = std::clamp(seek_position, static_cast<int64_t>(0),
static_cast<int64_t>(buffer.size()));
if (result) { if (result) {
*result = static_cast<int64>(seek_position); *result = static_cast<int64>(seek_position);
} }
@@ -200,7 +203,7 @@ tresult PLUGIN_API YaBStream::seek(int64 pos, int32 mode, int64* result) {
tresult PLUGIN_API YaBStream::tell(int64* pos) { tresult PLUGIN_API YaBStream::tell(int64* pos) {
if (pos) { if (pos) {
*pos = static_cast<int64>(seek_position); *pos = seek_position;
return Steinberg::kResultOk; return Steinberg::kResultOk;
} else { } else {
return Steinberg::kInvalidArgument; return Steinberg::kInvalidArgument;
+1 -1
View File
@@ -120,7 +120,7 @@ class YaBStream : public Steinberg::IBStream,
private: private:
std::vector<uint8_t> buffer; std::vector<uint8_t> buffer;
size_t seek_position = 0; int64_t seek_position = 0;
}; };
#pragma GCC diagnostic pop #pragma GCC diagnostic pop