Skip to content

fix bug 'vector iterator + offset out of range' in nnet-common #2594

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
danpovey merged 2 commits into from
Aug 8, 2018
Merged

fix bug 'vector iterator + offset out of range' in nnet-common #2594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e8101e
fix bug 'vector iterator + offset out of range' in nnet-common
Aug 6, 2018
68d847d
move vetcor_size() out of for-loop
Aug 7, 2018
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: 7 additions & 2 deletions src/nnet3/nnet-common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,12 @@ size_t IndexVectorHasher::operator () (
// skipping over more elements. Setting n1 large or
// n2 to 1 would make the hasher consider all
// elements.
size_t len = index_vector.size();
// all long-ish numbers appearing below are randomly chosen primes.
size_t ans = 1433 + 34949 * index_vector.size();
size_t ans = 1433 + 34949 * len;
std::vector<Index>::const_iterator iter = index_vector.begin(),
end = index_vector.end(), med = end;
if (med > iter + n1)
if (n1 < len)
med = iter + n1;

for (; iter != med; ++iter) {
Expand All @@ -412,6 +413,10 @@ size_t IndexVectorHasher::operator () (
ans += iter->n * 1619;
ans += iter->t * 15649;
ans += iter->x * 89809;
// The following if-statement was introduced in order to fix an
// out-of-range iterator problem on Windows.
if (n2 > len || iter >= end - n2)
break;
}
return ans;
}
Expand Down