From cd62cdadff1ce9c14f521a06660954774a76cf77 Mon Sep 17 00:00:00 2001 From: Taus Date: Mon, 16 Feb 2026 16:24:22 +0000 Subject: [PATCH] Python: Fix bad join in `returnStep` --- .../python/dataflow/new/internal/TypeTrackingImpl.qll | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll index 2f98ab70719..95434b05451 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll @@ -202,11 +202,18 @@ module TypeTrackingInput implements Shared::TypeTrackingInput { */ predicate returnStep(Node nodeFrom, LocalSourceNode nodeTo) { exists(DataFlowPrivate::ExtractedDataFlowCall call | - nodeFrom.(DataFlowPrivate::ReturnNode).getEnclosingCallable() = call.getCallable() and + returnNodeEnclosingCallable(nodeFrom) = call.getCallable() and nodeTo.(DataFlowPublic::CfgNode).getNode() = call.getNode() ) } + pragma[nomagic] + private DataFlowDispatch::DataFlowCallable returnNodeEnclosingCallable( + DataFlowPrivate::ReturnNode returnNode + ) { + result = returnNode.getEnclosingCallable() + } + /** * Holds if `nodeFrom` is being written to the `content` content of the object in `nodeTo`. */