Skip to content

fix: add value checking to @validateByteRange #3322

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
merged 2 commits into from
Jan 6, 2025
Merged

fix: add value checking to @validateByteRange #3322

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c5bc45
Add value checking to @validateByteRange
airween Jan 6, 2025
9158477
Add check after intervall parsing, spell fix
airween Jan 6, 2025
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
26 changes: 17 additions & 9 deletions src/operators/validate_byte_range.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ bool ValidateByteRange::getRange(const std::string &rangeRepresentation,
"' into a number");
return false;
}
if ((start < 0) || (start > 255)) {
error->assign("Invalid range start value: " +
std::to_string(start));
return false;
}
table[start >> 3] = (table[start >> 3] | (1 << (start & 0x7)));
return true;
}
Expand All @@ -60,11 +65,6 @@ bool ValidateByteRange::getRange(const std::string &rangeRepresentation,
return false;
}

if ((start < 0) || (start > 255)) {
error->assign("Invalid range start value: " +
std::to_string(start));
return false;
}
if ((end < 0) || (end > 255)) {
error->assign("Invalid range end value: " + std::to_string(end));
return false;
Expand All @@ -87,21 +87,29 @@ bool ValidateByteRange::getRange(const std::string &rangeRepresentation,
bool ValidateByteRange::init(const std::string &file,
std::string *error) {
size_t pos = m_param.find_first_of(",");
bool rc;

if (pos == std::string::npos) {
getRange(m_param, error);
rc = getRange(m_param, error);
} else {
getRange(std::string(m_param, 0, pos), error);
rc = getRange(std::string(m_param, 0, pos), error);
}

if (rc == false) {
return false;
}

while (pos != std::string::npos) {
size_t next_pos = m_param.find_first_of(",", pos + 1);

if (next_pos == std::string::npos) {
getRange(std::string(m_param, pos + 1, m_param.length() -
rc = getRange(std::string(m_param, pos + 1, m_param.length() -
(pos + 1)), error);
} else {
getRange(std::string(m_param, pos + 1, next_pos - (pos + 1)), error);
rc = getRange(std::string(m_param, pos + 1, next_pos - (pos + 1)), error);
}
if (rc == false) {
return false;
}
pos = next_pos;
}
Expand Down
Loading