Skip to content

[tree] prevent integer overflow in nentries #20227

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

[tree] prevent integer overflow in nentries #20227

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tree/tree/src/TChain.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ void TChain::Loop(Option_t* option, Long64_t nentries, Long64_t firstentry)
if (LoadTree(firstentry) < 0) return;

if (firstentry < 0) firstentry = 0;
Long64_t lastentry = firstentry + nentries -1;
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
if (lastentry > fEntries-1) {
lastentry = fEntries -1;
}
Expand Down
24 changes: 14 additions & 10 deletions tree/treeplayer/src/TTreePlayer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ TTree *TTreePlayer::CopyTree(const char *selection, Option_t *, Long64_t nentrie

//loop on the specified entries
Int_t tnumber = -1;
for (entry=firstentry;entry<firstentry+nentries;entry++) {
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
for (entry = firstentry; entry <= lastentry; entry++) {
entryNumber = fTree->GetEntryNumber(entry);
if (entryNumber < 0) break;
Long64_t localEntry = fTree->LoadTree(entryNumber);
Expand Down Expand Up @@ -616,7 +617,7 @@ Long64_t TTreePlayer::GetEntries(const char *selection)

Long64_t TTreePlayer::GetEntriesToProcess(Long64_t firstentry, Long64_t nentries) const
{
Long64_t lastentry = firstentry + nentries - 1;
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
if (lastentry > fTree->GetEntriesFriend()-1) {
lastentry = fTree->GetEntriesFriend() - 1;
nentries = lastentry - firstentry + 1;
Expand Down Expand Up @@ -2072,7 +2073,8 @@ TPrincipal *TTreePlayer::Principal(const char *varexp, const char *selection, Op
//*-*- loop on all selected entries
fSelectedRows = 0;
Int_t tnumber = -1;
for (entry=firstentry;entry<firstentry+nentries;entry++) {
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
for (entry = firstentry; entry < lastentry; entry++) {
entryNumber = fTree->GetEntryNumber(entry);
if (entryNumber < 0) break;
Long64_t localEntry = fTree->LoadTree(entryNumber);
Expand Down Expand Up @@ -2257,16 +2259,18 @@ Long64_t TTreePlayer::Process(TSelector *selector,Option_t *option, Long64_t nen
//set the file cache
TTreeCache *tpf = nullptr;
TFile *curfile = fTree->GetCurrentFile();
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
if (curfile) {
tpf = (TTreeCache*)curfile->GetCacheRead(fTree);
if (tpf)
tpf->SetEntryRange(firstentry,firstentry+nentries);
tpf->SetEntryRange(firstentry, lastentry);
else {
// Create the TTreeCache with the default size unless the
// user explicitly disabled it.
fTree->EnableCache();
tpf = (TTreeCache*)curfile->GetCacheRead(fTree);
if (tpf) tpf->SetEntryRange(firstentry,firstentry+nentries);
if (tpf)
tpf->SetEntryRange(firstentry, lastentry);
}
}

Expand All @@ -2291,7 +2295,7 @@ Long64_t TTreePlayer::Process(TSelector *selector,Option_t *option, Long64_t nen
fSelectorUpdate = selector;
UpdateFormulaLeaves();

for (entry=firstentry;entry<firstentry+nentries;entry++) {
for (entry = firstentry; entry <= lastentry; entry++) {
entryNumber = fTree->GetEntryNumber(entry);
if (entryNumber < 0) break;
if (timer && timer->ProcessEvents()) break;
Expand Down Expand Up @@ -2711,9 +2715,8 @@ Long64_t TTreePlayer::Scan(const char *varexp, const char *selection,
fSelectedRows = 0;
Int_t tnumber = -1;
bool exitloop = false;
for (entry=firstentry;
entry<(firstentry+nentries) && !exitloop;
entry++) {
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
for (entry = firstentry; entry <= lastentry && !exitloop; entry++) {
entryNumber = fTree->GetEntryNumber(entry);
if (entryNumber < 0) break;
Long64_t localEntry = fTree->LoadTree(entryNumber);
Expand Down Expand Up @@ -2892,7 +2895,8 @@ TSQLResult *TTreePlayer::Query(const char *varexp, const char *selection,
fSelectedRows = 0;
Int_t tnumber = -1;
Int_t *fields = new Int_t[ncols];
for (entry=firstentry;entry<firstentry+nentries;entry++) {
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
for (entry = firstentry; entry <= lastentry; entry++) {
entryNumber = fTree->GetEntryNumber(entry);
if (entryNumber < 0) break;
Long64_t localEntry = fTree->LoadTree(entryNumber);
Expand Down
2 changes: 1 addition & 1 deletion tree/treeviewer/src/TSpider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ Double_t TSpider::FindTextAngle(Double_t angle)

Long64_t TSpider::GetEntriesToProcess(Long64_t firstentry, Long64_t nentries) const
{
Long64_t lastentry = firstentry + nentries - 1;
Long64_t lastentry = nentries == TTree::kMaxEntries ? nentries - 1 : firstentry + nentries - 1;
if (lastentry > fTree->GetEntriesFriend()-1) {
lastentry = fTree->GetEntriesFriend() - 1;
nentries = lastentry - firstentry + 1;
Expand Down
Loading