Skip to content

refactor: defensive hardening for binary reader bounds checks #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
orbisai0security wants to merge 1 commit into from
Closed

refactor: defensive hardening for binary reader bounds checks #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/binary_reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void BinaryReader_clearBuffer(BinaryReader* reader) {

static void readCheck(BinaryReader* reader, void* dest, size_t bytes) {
if (reader->buffer != nullptr) {
if (reader->bufferPos + bytes > reader->bufferSize) {
if (reader->bufferPos > reader->bufferSize || bytes > reader->bufferSize - reader->bufferPos) {
size_t absPos = reader->bufferBase + reader->bufferPos;
fprintf(stderr, "BinaryReader: buffer read error at position 0x%zX (requested %zu bytes, buffer has %zu remaining)\n", absPos, bytes, reader->bufferSize - reader->bufferPos);
abort();
Expand Down Expand Up @@ -106,7 +106,7 @@ uint8_t* BinaryReader_readBytesAt(BinaryReader* reader, size_t offset, size_t co
uint8_t* buf = safeMalloc(count);

if (reader->buffer != nullptr) {
if (offset < reader->bufferBase || offset + count > reader->bufferBase + reader->bufferSize) {
if (offset < reader->bufferBase || (offset - reader->bufferBase) > reader->bufferSize || count > reader->bufferSize - (offset - reader->bufferBase)) {
fprintf(stderr, "BinaryReader: readBytesAt offset 0x%zX+%zu out of buffer range [0x%zX, 0x%zX)\n", offset, count, reader->bufferBase, reader->bufferBase + reader->bufferSize);
abort();
}
Expand Down