Skip to content

Allow reading v5 TF1 that were stored memberwise in a TClonesArray. #3964

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
pcanal merged 4 commits into from
Jun 19, 2019
Merged

Allow reading v5 TF1 that were stored memberwise in a TClonesArray. #3964

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c608d9
Allow reading v5 TF1 that were stored memberwise in a TClonesArray.
pcanal Jun 13, 2019
255dad6
TClonesArray::Expand* avoid nullptr dereference if object is invalid
pcanal Jun 14, 2019
7f3ac5f
Work-around gcc optimization bug.
pcanal Jun 17, 2019
1982f62
TGraph2D prevent random memory reads.
pcanal Jun 18, 2019
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
Prev Previous commit
Next Next commit
TClonesArray::Expand* avoid nullptr dereference if object is invalid
  • Loading branch information
@pcanal
pcanal committed Jun 18, 2019
commit 255dad6827d87e3e8df520bfdffbb5c876baca7b
10 changes: 9 additions & 1 deletion core/cont/src/TClonesArray.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,10 @@ void TClonesArray::Expand(Int_t newSize)
Error ("Expand", "newSize must be positive (%d)", newSize);
return;
}
if (!fKeep) {
Error("ExpandCreate", "Not initialized properly, fKeep is still a nullptr");
return;
}
if (newSize == fSize)
return;
if (newSize < fSize) {
Expand Down Expand Up @@ -497,7 +501,11 @@ void TClonesArray::ExpandCreate(Int_t n)
{
if (n < 0) {
Error("ExpandCreate", "n must be positive (%d)", n);
return ;
return;
}
if (!fKeep) {
Error("ExpandCreate", "Not initialized properly, fKeep is still a nullptr");
return;
}
if (n > fSize)
Expand(TMath::Max(n, GrowBy(fSize)));
Expand Down