Skip to content

Commit 4b90a87

Browse files
committed
Revert "[treeplayer] prevent nullptr access in Restart (#19817)"
This reverts commit d95cff9.
1 parent d2cbd74 commit 4b90a87

File tree

2 files changed

+3
-36
lines changed

2 files changed

+3
-36
lines changed

tree/treeplayer/src/TTreeReader.cxx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,14 +567,9 @@ void TTreeReader::Restart()
567567
fProxiesSet = false; // we might get more value readers, meaning new proxies.
568568
fEntry = -1;
569569
if (const auto curFile = fTree->GetCurrentFile()) {
570-
if (!fTree->GetTree()) {
571-
fTree->LoadTree(0);
572-
}
573-
if (fTree->GetTree()) {
574-
if (auto tc = fTree->GetTree()->GetReadCache(curFile, true)) {
575-
tc->DropBranch("*", true);
576-
tc->ResetCache();
577-
}
570+
if (auto tc = fTree->GetTree()->GetReadCache(curFile, true)) {
571+
tc->DropBranch("*", true);
572+
tc->ResetCache();
578573
}
579574
}
580575
}

tree/treeplayer/test/regressions.cxx

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -263,31 +263,3 @@ TEST(TTreeFormulaRegressions, WrongName)
263263
EXPECT_EQ(t.Draw("s.Eta()", ""), -1);
264264
}
265265
}
266-
267-
// https://github.com/root-project/root/issues/19814
268-
TEST(TTreeReaderRegressions, UninitializedChain)
269-
{
270-
auto filename = "eve19814.root";
271-
auto treename = "events";
272-
auto brname = "x";
273-
const int refval = 19814;
274-
{
275-
TFile f(filename, "RECREATE");
276-
TTree t(treename, "");
277-
int x = refval;
278-
t.Branch(brname, &x);
279-
t.Fill();
280-
f.Write();
281-
}
282-
{
283-
TChain ch(treename);
284-
ch.Add(filename);
285-
TTreeReader reader(&ch);
286-
reader.SetEntriesRange(0, ch.GetEntries());
287-
EXPECT_EQ(reader.GetEntries(), 1);
288-
TTreeReaderValue<int> x(reader, brname);
289-
EXPECT_TRUE(reader.Next());
290-
EXPECT_EQ(*x, refval);
291-
}
292-
gSystem->Unlink(filename);
293-
}

0 commit comments

Comments
 (0)