Skip to content

Fix ROOT-7121: Stack corruption in RooVectorDataStore #116

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
vgvassilev merged 4 commits into from
May 31, 2017
Merged

Fix ROOT-7121: Stack corruption in RooVectorDataStore #116

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1699587
Fix stack corruption in RooVectorDataStore.
hageboeck Dec 8, 2015
2555663
Merge remote-tracking branch 'upstream/master' into RooVectorDataStor…
hageboeck Dec 8, 2015
d94db5c
Revert to local cache update list.
hageboeck May 2, 2017
fa62c90
Implement clang-format styles.
hageboeck May 31, 2017
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
33 changes: 16 additions & 17 deletions roofit/roofitcore/src/RooVectorDataStore.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,31 +1294,29 @@ void RooVectorDataStore::forceCacheUpdate()



typedef RooVectorDataStore::RealVector* pRealVector ;
////////////////////////////////////////////////////////////////////////////////

void RooVectorDataStore::recalculateCache( const RooArgSet *projectedArgs, Int_t firstEvent, Int_t lastEvent, Int_t stepSize, Bool_t skipZeroWeights)
{
if (!_cache) return ;

pRealVector tv[1000] ;
Int_t ntv(0) ;
std::vector<RooVectorDataStore::RealVector *> tv;
tv.reserve(_cache->_nReal * 0.7); // Typically, 30..60% need to be recalculated

// Check which items need recalculation
for (Int_t i=0 ; i<_cache->_nReal ; i++) {
if ((*(_cache->_firstReal+i))->needRecalc() || _forcedUpdate) {
tv[ntv] = (*(_cache->_firstReal+i)) ;
tv[ntv]->_nativeReal->setOperMode(RooAbsArg::ADirty) ;
tv[ntv]->_nativeReal->_operMode=RooAbsArg::Auto ;
// cout << "recalculate: need to update " << tv[ntv]->_nativeReal->GetName() << endl ;
ntv++ ;
RooVectorDataStore::RealVector *cacheElem = *(_cache->_firstReal + i);
tv.push_back(cacheElem);
cacheElem->_nativeReal->setOperMode(RooAbsArg::ADirty);
cacheElem->_nativeReal->_operMode = RooAbsArg::Auto;
}
}
_forcedUpdate = kFALSE ;

// If no recalculations are neede stop here
if (ntv==0) {
return ;
// If no recalculations are needed stop here
if (tv.empty()) {
return;
}
// Refill caches of elements that require recalculation
// cout << "recalc error count before update = " << RooAbsReal::numEvalErrors() << endl ;
Expand All @@ -1339,10 +1337,11 @@ void RooVectorDataStore::recalculateCache( const RooArgSet *projectedArgs, Int_t
get(i) ;
Bool_t zeroWeight = (weight()==0) ;
if (!zeroWeight || !skipZeroWeights) {
for (int j=0 ; j<ntv ; j++) {
tv[j]->_nativeReal->_valueDirty=kTRUE ;
tv[j]->_nativeReal->getValV(tv[j]->_nset ? tv[j]->_nset : usedNset) ;
tv[j]->write(i) ;
for (std::vector<RooVectorDataStore::RealVector *>::iterator cacheIt = tv.begin(); cacheIt != tv.end();
++cacheIt) {
(*cacheIt)->_nativeReal->_valueDirty = kTRUE;
(*cacheIt)->_nativeReal->getValV((*cacheIt)->_nset ? (*cacheIt)->_nset : usedNset);
(*cacheIt)->write(i);
}
}
// if (zeroWeight) {
Expand All @@ -1362,8 +1361,8 @@ void RooVectorDataStore::recalculateCache( const RooArgSet *projectedArgs, Int_t
// cout << "recalculate: end of updating" << endl ;
// cout << "recalc error count after update = " << RooAbsReal::numEvalErrors() << endl ;

for (int j=0 ; j<ntv ; j++) {
tv[j]->_nativeReal->setOperMode(RooAbsArg::AClean) ;
for (std::vector<RooVectorDataStore::RealVector *>::iterator cacheIt = tv.begin(); cacheIt != tv.end(); ++cacheIt) {
(*cacheIt)->_nativeReal->setOperMode(RooAbsArg::AClean);
}

delete ownedNset ;
Expand Down