JS: Angular: replace getAnInitialUse with parameterNode

asger-semmle · asger-semmle · commit ddf0d5379db3 · 2019-10-09T12:16:11.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll b/javascript/ql/src/semmle/javascript/frameworks/AngularJS/AngularJSCore.qll
@@ -1062,21 +1062,21 @@ private class RouteInstantiatedController extends Controller {
 /**
  * Dataflow for the arguments of AngularJS dependency-injected functions.
  */
-private class DependencyInjectedArgumentInitializer extends DataFlow::AnalyzedValueNode {
+private class DependencyInjectedArgumentInitializer extends DataFlow::AnalyzedNode {
   DataFlow::AnalyzedNode service;
 
   DependencyInjectedArgumentInitializer() {
     exists(
-      AngularJS::InjectableFunction f, SimpleParameter param, AngularJS::CustomServiceDefinition def
+      AngularJS::InjectableFunction f, Parameter param, AngularJS::CustomServiceDefinition def
     |
-      astNode = param.getAnInitialUse() and
+      this = DataFlow::parameterNode(param) and
       def.getServiceReference() = f.getAResolvedDependency(param) and
       service = def.getAService()
     )
   }
 
   override AbstractValue getAValue() {
-    result = DataFlow::AnalyzedValueNode.super.getAValue() or
+    result = DataFlow::AnalyzedNode.super.getAValue() or
     result = service.getALocalValue()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1062,21 +1062,21 @@ private class RouteInstantiatedController extends Controller {`
`1062`	`1062`	`/**`
`1063`	`1063`	`* Dataflow for the arguments of AngularJS dependency-injected functions.`
`1064`	`1064`	`*/`
`1065`		`-private class DependencyInjectedArgumentInitializer extends DataFlow::AnalyzedValueNode {`
	`1065`	`+private class DependencyInjectedArgumentInitializer extends DataFlow::AnalyzedNode {`
`1066`	`1066`	`DataFlow::AnalyzedNode service;`
`1067`	`1067`
`1068`	`1068`	`DependencyInjectedArgumentInitializer() {`
`1069`	`1069`	`exists(`
`1070`		`- AngularJS::InjectableFunction f, SimpleParameter param, AngularJS::CustomServiceDefinition def`
	`1070`	`+ AngularJS::InjectableFunction f, Parameter param, AngularJS::CustomServiceDefinition def`
`1071`	`1071`	`\|`
`1072`		`- astNode = param.getAnInitialUse() and`
	`1072`	`+ this = DataFlow::parameterNode(param) and`
`1073`	`1073`	`def.getServiceReference() = f.getAResolvedDependency(param) and`
`1074`	`1074`	`service = def.getAService()`
`1075`	`1075`	`)`
`1076`	`1076`	`}`
`1077`	`1077`
`1078`	`1078`	`override AbstractValue getAValue() {`
`1079`		`- result = DataFlow::AnalyzedValueNode.super.getAValue() or`
	`1079`	`+ result = DataFlow::AnalyzedNode.super.getAValue() or`
`1080`	`1080`	`result = service.getALocalValue()`
`1081`	`1081`	`}`
`1082`	`1082`	`}`