Skip to content

[tree] prevent nullptr access in ttreereader #15929

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

Open
ferdymercury wants to merge 3 commits into
base: master
Choose a base branch
from
+31 −0
Open

[tree] prevent nullptr access in ttreereader #15929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba2f95
[tree] prevent nullptr access in ttreereader
ferdymercury Jun 25, 2024
4d0087f
[tree] setup reader proxy when registering after constructor
ferdymercury Sep 16, 2025
4f04fe5
[tree] add unit test for ttreereadervaluefast bug
ferdymercury Jun 26, 2024
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
5 changes: 5 additions & 0 deletions tree/treeplayer/inc/ROOT/TTreeReaderValueFast.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class TTreeReaderValueFastBase {
}
fRemaining -= adjust;
} else {
if (!fBranch) {
fReadStatus = ROOT::Internal::TTreeReaderValueBase::kReadError;
// printf("Failed to retrieve branch.\n");
return -1;
}
fRemaining = fBranch->GetBulkRead().GetEntriesSerialized(eventNum, fBuffer);
if (R__unlikely(fRemaining < 0)) {
fReadStatus = ROOT::Internal::TTreeReaderValueBase::kReadError;
Expand Down
7 changes: 7 additions & 0 deletions tree/treeplayer/src/TTreeReaderFast.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ TTreeReaderFast::SetEntry(Long64_t entry)
void TTreeReaderFast::RegisterValueReader(ROOT::Experimental::Internal::TTreeReaderValueFastBase* reader)
{
fValues.push_back(reader);
if (fTree && reader) { // A subpart of Initialize() must be called if we register new readers after the constructor.
reader->CreateProxy();
if (reader->GetSetupStatus() != ROOT::Internal::TTreeReaderValueBase::kSetupMatch) {
//printf("Reader setup failed. Status: %d\n", reader->GetSetupStatus());
fEntryStatus = TTreeReader::kEntryBadReader;
}
}
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
19 changes: 19 additions & 0 deletions tree/treeplayer/test/regressions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "TLorentzVector.h"
#include <Math/Vector3D.h>
#include <ROOT/TestSupport.hxx>
#include "ROOT/TTreeReaderValueFast.hxx"
#include "TNtuple.h"

#include "TTreePlayer.h"

Expand Down Expand Up @@ -340,6 +342,23 @@ TEST(TTreeReaderRegressions, XYZVectors)
}
}

// ROOT-8842 https://its.cern.ch/jira/browse/ROOT-8842
TEST(TTreeReaderRegressions, ValueFastTuple)
{
TNtuple tree("tuple", "ROOT-8842", "px:py:pz:energy");
for (auto i = 0; i < 1000000; ++i)
tree.Fill(i, i + 1, i + 2, i + 3);
ROOT::Experimental::TTreeReaderFast reader(&tree);
ROOT::Experimental::TTreeReaderValueFast<float> px(reader, "px");
ROOT::Experimental::TTreeReaderValueFast<float> py(reader, "py");
ROOT::Experimental::TTreeReaderValueFast<float> pz(reader, "pz");
double total = 0.0;
// reader.SetEntry(0); If I uncomment this, the crash disappears
for (auto it = reader.begin(); it != reader.end(); ++it)
total += sqrt((*px) * (*px) + (*py) * (*py) + (*pz) * (*pz));
EXPECT_NEAR(total, 866026269930.1345215, 100);
}

// https://github.com/root-project/root/issues/20226
TEST(TTreeScan, IntOverflow)
{
Expand Down
Loading