diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for overflows when performing expansion

Browse Source 
case the factor size after expansion be bigger than an unsigned integer, abort the program
This commit is contained in:
Tiago Gomes 2012-04-20 17:16:10 +01:00
parent 0ffa409a80
commit 085ebe1e96
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/CLPBN/clpbn/bp/Parfactor.cpp
View File

@ -583,7 +583,14 @@ Parfactor::expandPotential (
unsigned newRange, unsigned newRange,
const vector<unsigned>& sumIndexes) const vector<unsigned>& sumIndexes)
{ {
unsigned newSize = (params_.size() / ranges_[fIdx]) * newRange; Params::size_type newSize = (params_.size() / ranges_[fIdx]) * newRange;
if (newSize > Util::maxUnsigned()) {
// factor will become to bigger, is not worth to continue
cerr << "error: an overflow occurred when performing expansion" ;
cerr << endl;
abort();
}
Params copy = params_; Params copy = params_;
params_.clear(); params_.clear();
params_.reserve (newSize); params_.reserve (newSize);
@ -599,6 +606,9 @@ Parfactor::expandPotential (
ranges_[fIdx] = newRange; ranges_[fIdx] = newRange;
vector<unsigned> indices (ranges_.size(), 0); vector<unsigned> indices (ranges_.size(), 0);
for (unsigned k = 0; k < newSize; k++) { for (unsigned k = 0; k < newSize; k++) {
if (index >= copy.size()) {
abort();
}
assert (index < copy.size()); assert (index < copy.size());
params_.push_back (copy[index]); params_.push_back (copy[index]);
for (int i = ranges_.size() - 1; i >= 0; i--) { for (int i = ranges_.size() - 1; i >= 0; i--) {