Skip to content

Protection against out of bound access in CTF dictionaries #4123

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
shahor02 wants to merge 1 commit into from
Closed

Protection against out of bound access in CTF dictionaries #4123

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
9 changes: 5 additions & 4 deletions Utilities/rANS/include/rANS/internal/SymbolTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ SymbolTable<T>::SymbolTable(const SymbolStatistics& symbolStats, size_t probabil
mSymbols.emplace_back(symCumulated, symFrequency, probabiltyBits);
mIndex.emplace_back(&mSymbols.back());
}
if (int(mSymbols.size()) == mMax - mMin + 2) {
mSymbols.back().freq = 0; // make literal symbol to have 0 freq
}

// advanced diagnostics for debug builds
#if !defined(NDEBUG)
Expand All @@ -81,10 +84,8 @@ SymbolTable<T>::SymbolTable(const SymbolStatistics& symbolStats, size_t probabil
template <typename T>
inline const T& SymbolTable<T>::operator[](int64_t index) const
{
const auto idx = index - mMin;
assert(idx >= 0);
assert(idx < mSymbols.size());
return *(mIndex[idx]);
const uint64_t idx = static_cast<uint64_t>(index - mMin);
return idx < mSymbols.size() ? *(mIndex[idx]) : getLiteralSymbol();
}

template <typename T>
Expand Down