Python: Refactor argument matching

RasmusWL · RasmusWL · commit eff47457bfba · 2020-10-14T10:37:38.000+02:00
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll b/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll
@@ -407,9 +407,7 @@ private module Stdlib {
     }
 
     override DataFlow::Node getCommand() {
-      result.asCfgNode() = node.getArg(0)
-      or
-      result.asCfgNode() = node.getArgByName("cmd")
+      result.asCfgNode() in [node.getArg(0), node.getArgByName("cmd")]
     }
   }
 
@@ -476,9 +474,7 @@ private module Stdlib {
     PlatformPopenCall() { node.getFunction() = platform_attr("popen").asCfgNode() }
 
     override DataFlow::Node getCommand() {
-      result.asCfgNode() = node.getArg(0)
-      or
-      result.asCfgNode() = node.getArgByName("cmd")
+      result.asCfgNode() in [node.getArg(0), node.getArgByName("cmd")]
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,7 @@ private module Stdlib {`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`override DataFlow::Node getCommand() {`
`410`		`- result.asCfgNode() = node.getArg(0)`
`411`		`- or`
`412`		`- result.asCfgNode() = node.getArgByName("cmd")`
	`410`	`+ result.asCfgNode() in [node.getArg(0), node.getArgByName("cmd")]`
`413`	`411`	`}`
`414`	`412`	`}`
`415`	`413`
`@@ -476,9 +474,7 @@ private module Stdlib {`
`476`	`474`	`PlatformPopenCall() { node.getFunction() = platform_attr("popen").asCfgNode() }`
`477`	`475`
`478`	`476`	`override DataFlow::Node getCommand() {`
`479`		`- result.asCfgNode() = node.getArg(0)`
`480`		`- or`
`481`		`- result.asCfgNode() = node.getArgByName("cmd")`
	`477`	`+ result.asCfgNode() in [node.getArg(0), node.getArgByName("cmd")]`
`482`	`478`	`}`
`483`	`479`	`}`
`484`	`480`	`}`