[ntuple] fix use-after-move in RNTupleDescriptorBuilder::AddColumn()

jblomer · jblomer · commit 12ef34a785e8 · 2026-06-14T01:39:01.000+02:00
diff --git a/tree/ntuple/src/RNTupleDescriptor.cxx b/tree/ntuple/src/RNTupleDescriptor.cxx
@@ -1300,9 +1300,9 @@ ROOT::RResult<void> ROOT::Internal::RNTupleDescriptorBuilder::AddColumn(RColumnD
 
    if (!columnDesc.IsAliasColumn())
       fDescriptor.fNPhysicalColumns++;
-   fDescriptor.fColumnDescriptors.emplace(logicalId, std::move(columnDesc));
    if (fDescriptor.fHeaderExtension)
       fDescriptor.fHeaderExtension->MarkExtendedColumn(columnDesc);
+   fDescriptor.fColumnDescriptors.emplace(logicalId, std::move(columnDesc));
 
    return RResult<void>::Success();
 }

Original file line number	Diff line number	Diff line change
`@@ -1300,9 +1300,9 @@ ROOT::RResult<void> ROOT::Internal::RNTupleDescriptorBuilder::AddColumn(RColumnD`
`1300`	`1300`
`1301`	`1301`	`if (!columnDesc.IsAliasColumn())`
`1302`	`1302`	`fDescriptor.fNPhysicalColumns++;`
`1303`		`- fDescriptor.fColumnDescriptors.emplace(logicalId, std::move(columnDesc));`
`1304`	`1303`	`if (fDescriptor.fHeaderExtension)`
`1305`	`1304`	`fDescriptor.fHeaderExtension->MarkExtendedColumn(columnDesc);`
	`1305`	`+ fDescriptor.fColumnDescriptors.emplace(logicalId, std::move(columnDesc));`
`1306`	`1306`
`1307`	`1307`	`return RResult<void>::Success();`
`1308`	`1308`	`}`