Skip to content

Commit 341dbce

Browse files
committed
Python: simplify code following review suggestion
also standardise on camelCase.
1 parent 8aa6b1a commit 341dbce

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

python/ql/src/semmle/python/frameworks/Stdlib.qll

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -940,17 +940,10 @@ private module Stdlib {
940940
)
941941
or
942942
// Data injection
943-
exists(
944-
BinaryExprNode slash, DataFlow::Node right, DataFlow::Node left, DataFlow::TypeTracker t2
945-
|
943+
exists(BinaryExprNode slash, DataFlow::Node pathOperand, DataFlow::TypeTracker t2 |
946944
slash.getOp() instanceof Div and
947-
right.asCfgNode() = slash.getRight() and
948-
left.asCfgNode() = slash.getLeft() and
949-
(
950-
left.getALocalSource() = pathlibPath(t2)
951-
or
952-
right.getALocalSource() = pathlibPath(t2)
953-
) and
945+
pathOperand.asCfgNode() = slash.getAnOperand() and
946+
pathOperand.getALocalSource() = pathlibPath(t2) and
954947
t2.end()
955948
|
956949
t.start() and
@@ -1021,23 +1014,23 @@ private module Stdlib {
10211014
nodeTo.getALocalSource() = pathlibPath() and
10221015
(
10231016
// Special handling of the `/` operator
1024-
exists(BinaryExprNode slash, DataFlow::Node path_operand, DataFlow::Node data_operand |
1017+
exists(BinaryExprNode slash, DataFlow::Node pathOperand, DataFlow::Node dataOperand |
10251018
slash.getOp() instanceof Div and
10261019
(
1027-
path_operand.asCfgNode() = slash.getLeft() and
1028-
data_operand.asCfgNode() = slash.getRight()
1020+
pathOperand.asCfgNode() = slash.getLeft() and
1021+
dataOperand.asCfgNode() = slash.getRight()
10291022
or
1030-
path_operand.asCfgNode() = slash.getRight() and
1031-
data_operand.asCfgNode() = slash.getLeft()
1023+
pathOperand.asCfgNode() = slash.getRight() and
1024+
dataOperand.asCfgNode() = slash.getLeft()
10321025
) and
1033-
path_operand.getALocalSource() = pathlibPath()
1026+
pathOperand.getALocalSource() = pathlibPath()
10341027
|
10351028
nodeTo.asCfgNode() = slash and
10361029
nodeFrom in [
10371030
// type-preserving call
1038-
path_operand,
1031+
pathOperand,
10391032
// data injection
1040-
data_operand
1033+
dataOperand
10411034
]
10421035
)
10431036
or

0 commit comments

Comments
 (0)