hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
This commit is contained in:
yoff
2023-12-15 09:58:27 +01:00
committed by GitHub
parent abd544d96c
commit c395d2d957
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
View File

@@ -1531,7 +1531,11 @@ abstract class ParameterNodeImpl extends Node {
class LambdaSelfReferenceNode extends ParameterNodeImpl, TLambdaSelfReferenceNode {
private Function callable;
LambdaSelfReferenceNode() { this = TLambdaSelfReferenceNode(callable) }
LambdaSelfReferenceNode() {
this = TLambdaSelfReferenceNode(callable) and
// TODO: Remove this restriction when adding proper support for captured variables in the body of the function we generate for comprehensions
exists(TFunction(callable))
}
final Function getCallable() { result = callable }

4
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
View File

@@ -392,7 +392,7 @@ module VariableCapture {
ExprCfgNode() { isExpressionNode(this) }
}
private predicate closureFlowStep(ExprCfgNode e1, ExprCfgNode e2) {
private predicate closureFlowStep(ExprCfgNode fromNode, ExprCfgNode toNode) {
// simpleAstFlowStep(e1, e2)
// or
exists(SsaVariable def |
@@ -689,7 +689,7 @@ predicate summaryFlowSteps(Node nodeFrom, Node nodeTo) {
IncludePostUpdateFlow<PhaseDependentFlow<summaryLocalStep/2>::step/2>::step(nodeFrom, nodeTo)
}
predicate variableCaptureFlowStep(Node nodeFrom, Node nodeTo) {
predicate variableCaptureLocalFlowStep(Node nodeFrom, Node nodeTo) {
// Blindly applying use-use flow can result in a node that steps to itself, for
// example in while-loops. To uphold dataflow consistency checks, we don't want
// that. However, we do want to allow `[post] n` to `n` (to handle while loops), so

8
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
View File

@@ -116,7 +116,7 @@ newtype TNode =
exists(ParameterPosition ppos | ppos.isKeyword(_) | exists(callable.getParameter(ppos)))
} or
/** A synthetic node representing a captured variable. */
TCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn) or
TSynthCaptureNode(VariableCapture::Flow::SynthesizedCaptureNode cn) or
/** A synthetic node representing the heap of a function. Used for variable capture. */
TLambdaSelfReferenceNode(Function f) {
f = any(VariableCapture::CapturedVariable v).getACapturingScope()
@@ -489,10 +489,8 @@ class CaptureNode extends Node, TCaptureNode {
/** Gets the `SynthesizedCaptureNode` that this node represents. */
VariableCapture::Flow::SynthesizedCaptureNode getSynthesizedCaptureNode() { result = cn }
override DataFlowCallable getEnclosingCallable() {
result = TFunction(cn.getEnclosingCallable())
or
result = TModule(cn.getEnclosingCallable())
override Scope getScope() {
result = cn.getEnclosingCallable()
}
override Location getLocation() { result = cn.getLocation() }