fixup! io: error out for rule with conflicting type for sources

root-project · Jan 14, 2025 · 2e3d281 · 2e3d281
1 parent 5bdf613
commit 2e3d281
Showing 1 changed file with 42 additions and 42 deletions.
diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
@@ -4744,53 +4744,53 @@ void TStreamerInfo::InsertArtificialElements(std::vector<const ROOT::TSchemaRule
       // NOTE: Before adding the rule we should check that the source do
       // existing in this StreamerInfo.
       const TObjArray *sources = rule->GetSource();
-      for(auto src : TRangeDynCast<ROOT::TSchemaRule::TSources>( *sources ))
-      {
-         auto source_element = dynamic_cast<TStreamerElement *>(GetElements()->FindObject(src->GetName()));
-         if (!source_element) {
-            // It might still be in one the base classes.
-            if (fClass->GetListOfRealData() && !fClass->GetListOfRealData()->FindObject(src->GetName()))
-            {
-               // Missing source.
-               if (!canIgnore(rule)) {
+      if (sources)
+         for (auto src : TRangeDynCast<ROOT::TSchemaRule::TSources>(*sources)) {
+            auto source_element = dynamic_cast<TStreamerElement *>(GetElements()->FindObject(src->GetName()));
+            if (!source_element) {
+               // It might still be in one the base classes.
+               if (fClass->GetListOfRealData() && !fClass->GetListOfRealData()->FindObject(src->GetName())) {
+                  // Missing source.
+                  if (!canIgnore(rule)) {
+                     TString ruleStr;
+                     rule->AsString(ruleStr);
+                     Warning("InsertArtificialElements",
+                             "For class %s in StreamerInfo %d is missing the source data member `%s` when trying to "
+                             "apply the "
+                             "rule:\n   %s",
+                             GetName(), GetClassVersion(), src->GetName(), ruleStr.Data());
+                  }
+                  rule = nullptr;
+                  break;
+               }
+            } else {
+               // The source exists, let's check if it has the expected type.
+               auto [memClass, memType, datasize, dimensions, totaldim] = GetSourceType(src, source_element);
+               if ((memClass != source_element->GetNewClass() || memType != source_element->GetNewType()) &&
+                   (memType != TVirtualStreamerInfo::kNoContextMenu && memType != TVirtualStreamerInfo::kNoType)) {
+                  const char *dim = src->GetDimensions();
                   TString ruleStr;
                   rule->AsString(ruleStr);
-                  Warning("InsertArtificialElements",
-                        "For class %s in StreamerInfo %d is missing the source data member `%s` when trying to apply the "
-                        "rule:\n   %s",
-                        GetName(), GetClassVersion(), src->GetName(), ruleStr.Data());
-               }
-               rule = nullptr;
-               break;
-            }
-         } else {
-            // The source exists, let's check if it has the expected type.
-            auto [memClass, memType, datasize, dimensions, totaldim] = GetSourceType(src, source_element);
-            if ((memClass != source_element->GetNewClass() || memType != source_element->GetNewType())
-                && (memType != TVirtualStreamerInfo::kNoContextMenu && memType != TVirtualStreamerInfo::kNoType))
-            {
-               const char *dim = src->GetDimensions();
-               TString ruleStr;
-               rule->AsString(ruleStr);
-               auto cl = source_element->GetNewClass();
-               TString classmsg;
-               if (memClass != cl) {
-                  classmsg = "and the memory TClass is \"";
-                  classmsg += cl ? cl->GetName() : "nullptr";
-                  classmsg += "\" while the rule needed \"";
-                  classmsg += memClass ? memClass->GetName() : "nullptr";
-                  classmsg += "\"";
+                  auto cl = source_element->GetNewClass();
+                  TString classmsg;
+                  if (memClass != cl) {
+                     classmsg = "and the memory TClass is \"";
+                     classmsg += cl ? cl->GetName() : "nullptr";
+                     classmsg += "\" while the rule needed \"";
+                     classmsg += memClass ? memClass->GetName() : "nullptr";
+                     classmsg += "\"";
+                  }
+                  Error("InsertArtificialElements",
+                        "For class %s in StreamerInfo %d a rule has conflicting type for the source \"%s %s%s\",\n"
+                        "   The TStreamerElement has memory type %d (needed %d) %s:\n   %s",
+                        GetName(), GetClassVersion(), src->GetTypeForDeclaration().Data(), src->GetName(),
+                        dim && dim[0] ? dim : "", source_element->GetNewType(), memType, classmsg.Data(),
+                        ruleStr.Data());
+                  rule = nullptr;
+                  break;
                }
-               Error("InsertArtificialElements",
-                     "For class %s in StreamerInfo %d a rule has conflicting type for the source \"%s %s%s\",\n"
-                     "   The TStreamerElement has memory type %d (needed %d) %s:\n   %s",
-                     GetName(), GetClassVersion(), src->GetTypeForDeclaration().Data(), src->GetName(),
-                     dim && dim[0] ? dim : "", source_element->GetNewType(), memType, classmsg.Data(), ruleStr.Data());
-               rule = nullptr;
-               break;
             }
          }
-      }
 
       if (!rule) continue;