1fd9670b71
ROOT now uses llvm/clang version 9 (updated from version 5)
No longer exclude arch s390x (better supported in llvm/clang 9)
Drop patches accepted upstream or previously backported
Backport some fixes that make more tests work
New subpackages: python{2,3}-distrdf, root-roofit-batchcompute
Require js-jsroot >= 6
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 1ca221f010fdcfb6249ae7b1cac77fbe29b86214 Mon Sep 17 00:00:00 2001
|
|
From: Enrico Guiraud <enrico.guiraud@cern.ch>
|
|
Date: Mon, 7 Jun 2021 11:02:48 +0200
|
|
Subject: [PATCH] [io] Avoid nullptr deref when printing warning in
|
|
TStreamerInfo
|
|
|
|
---
|
|
io/io/src/TStreamerInfo.cxx | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
|
|
index d545ab7be8..a026635890 100644
|
|
--- a/io/io/src/TStreamerInfo.cxx
|
|
+++ b/io/io/src/TStreamerInfo.cxx
|
|
@@ -1109,12 +1109,12 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
|
|
fClassVersion, GetName(), GetName(), GetName(), fClassVersion);
|
|
} else {
|
|
Warning("BuildCheck", "\n\
|
|
- The StreamerInfo from %s does not match existing one (%s:%d)\n\
|
|
+ The StreamerInfo does not match existing one (%s:%d)\n\
|
|
The existing one has not been used yet and will be discarded.\n\
|
|
Reading should work properly, however writing object of\n\
|
|
type %s will not work properly. Most likely the version number\n\
|
|
of the class was not properly updated [See ClassDef(%s,%d)].",
|
|
- file->GetName(), GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
|
|
+ GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.31.1
|
|
|