Skip to content

Commit eee2e9e

Browse files
committed
[tree] prevent nullptr access in ttreereader
when branch is not found Fixes first part of https://its.cern.ch/jira/browse/ROOT-8842
1 parent 23bf7da commit eee2e9e

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

tree/treeplayer/inc/ROOT/TTreeReaderValueFast.hxx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ class TTreeReaderValueFastBase {
6666
}
6767
fRemaining -= adjust;
6868
} else {
69+
if (!fBranch) {
70+
fReadStatus = ROOT::Internal::TTreeReaderValueBase::kReadError;
71+
// printf("Failed to retrieve branch.\n");
72+
return -1;
73+
}
6974
fRemaining = fBranch->GetBulkRead().GetEntriesSerialized(eventNum, fBuffer);
7075
if (R__unlikely(fRemaining < 0)) {
7176
fReadStatus = ROOT::Internal::TTreeReaderValueBase::kReadError;

0 commit comments

Comments
 (0)