Tweaked out-of-range check in VerticalBlockView to allow retrieving empty range

release/4.3a0
Richard Roberts 2012-11-26 19:21:03 +00:00
parent a5ab9ca32d
commit 3d331abb4b
1 changed files with 4 additions and 2 deletions

View File

@ -137,6 +137,7 @@ public:
assertInvariants(); assertInvariants();
size_t actualStartBlock = startBlock + blockStart_; size_t actualStartBlock = startBlock + blockStart_;
size_t actualEndBlock = endBlock + blockStart_; size_t actualEndBlock = endBlock + blockStart_;
if(startBlock != 0 && endBlock != 0)
checkBlock(actualStartBlock); checkBlock(actualStartBlock);
assert(actualEndBlock < variableColOffsets_.size()); assert(actualEndBlock < variableColOffsets_.size());
const size_t& startCol = variableColOffsets_[actualStartBlock]; const size_t& startCol = variableColOffsets_[actualStartBlock];
@ -148,6 +149,7 @@ public:
assertInvariants(); assertInvariants();
size_t actualStartBlock = startBlock + blockStart_; size_t actualStartBlock = startBlock + blockStart_;
size_t actualEndBlock = endBlock + blockStart_; size_t actualEndBlock = endBlock + blockStart_;
if(startBlock != 0 && endBlock != 0)
checkBlock(actualStartBlock); checkBlock(actualStartBlock);
assert(actualEndBlock < variableColOffsets_.size()); assert(actualEndBlock < variableColOffsets_.size());
const size_t& startCol = variableColOffsets_[actualStartBlock]; const size_t& startCol = variableColOffsets_[actualStartBlock];