Skip to content

fix: Detection of having reached the end of file was not done correctly. #232

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

Merged
paxcut merged 4 commits into from
Apr 13, 2026
+7 −7
Merged

fix: Detection of having reached the end of file was not done correctly. #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2183bb4
fix: Detection of having reached the end of file was not done correct…
paxcut Apr 12, 2026
934c51d
Adjust past eof check to occur in the byte after the input file's last.
paxcut Apr 13, 2026
61f6be2
Adjust past eof check to occur in the byte after the input file's last.
paxcut Apr 13, 2026
675bd6c
Reverted unnecessary changes and rewrote for efficiency (no storage)
paxcut Apr 13, 2026
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
12 changes: 6 additions & 6 deletions lib/source/pl/core/ast/ast_node_array_variable_decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ namespace pl::core::ast {
} else if (auto whileStatement = dynamic_cast<ASTNodeWhileStatement *>(sizeNode.get())) {
while (whileStatement->evaluateCondition(evaluator)) {
if (templatePattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data before termination condition was met.", { }, this->getLocation());

evaluator->handleAbort();
Expand All @@ -199,7 +199,7 @@ namespace pl::core::ast {
std::vector<u8> buffer(templatePattern->getSize());
while (true) {
if (templatePattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data before a null-entry was found.", "Try using a while-sized array instead to limit the size of the array.", this->getLocation());

evaluator->readData(evaluator->getReadOffset(), buffer.data(), buffer.size(), templatePattern->getSection());
Expand Down Expand Up @@ -246,7 +246,7 @@ namespace pl::core::ast {
evaluator->setReadOffset(startOffset + outputPattern->getSize());

if (outputPattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data.", { }, this->getLocation());
}

Expand Down Expand Up @@ -327,7 +327,7 @@ namespace pl::core::ast {
size_t patternCount = patterns.size();

if (arrayPattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data.", fmt::format("Entry {} exceeded data by {} bytes.", i, evaluator->getReadOffset() - evaluator->getDataSize()), this->getLocation());

if (!patterns.empty())
Expand Down Expand Up @@ -360,7 +360,7 @@ namespace pl::core::ast {
size_t patternCount = patterns.size();

if (arrayPattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data before termination condition was met.", { }, this->getLocation());

if (!patterns.empty())
Expand Down Expand Up @@ -398,7 +398,7 @@ namespace pl::core::ast {
std::vector<u8> buffer(pattern->getSize());

if (arrayPattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Array expanded past end of the data before a null-entry was found.", "Try using a while-sized array instead to limit the size of the array.", this->getLocation());

const auto patternSize = pattern->getSize();
Expand Down
2 changes: 1 addition & 1 deletion lib/source/pl/core/ast/ast_node_bitfield_array_variable_decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ namespace pl::core::ast {
this->m_type->createPatterns(evaluator, patterns);

if (arrayPattern->getSection() == ptrn::Pattern::MainSectionId)
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize() + 1))
if ((evaluator->getReadOffset() - evaluator->getDataBaseAddress()) > (evaluator->getDataSize()))
err::E0004.throwError("Bitfield array expanded past end of the data.", fmt::format("Entry {} exceeded data by {} bytes.", dataIndex, evaluator->getReadOffset() - evaluator->getDataSize()), this->getLocation());

auto ctrlFlow = evaluator->getCurrentControlFlowStatement();
Expand Down
Loading