Skip to content
Merged
Changes from all commits
Commits
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
[TDF] Fix ROOT-8975: TDF crashed when Defineing an existing branch
  • Loading branch information
eguiraud committed Sep 1, 2017
commit c1cb731e6f9f9d3572d4de9c6b0437f7c497b2d8
3 changes: 3 additions & 0 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,9 @@ public:
/// Refer to the first overload of this method for the full documentation.
TInterface<TCustomColumnBase> Define(std::string_view name, std::string_view expression)
{
auto loopManager = GetDataFrameChecked();
// this check must be done before jitting lest we throw exceptions in jitted code
TDFInternal::CheckTmpBranch(name, loopManager->GetTree());
auto retVal = CallJitTransformation("Define", name, expression);
return *(TInterface<TCustomColumnBase> *)retVal;
}
Expand Down