Merge pull request github#12843 from kaspersv/kaspersv/prevent-bad-js-join-order

kaspersv · web-flow · commit 9d34d090abaf · 2023-04-18T09:09:43.000+02:00
Prevent JS join order regression
diff --git a/javascript/ql/lib/semmle/javascript/InclusionTests.qll b/javascript/ql/lib/semmle/javascript/InclusionTests.qll
@@ -69,6 +69,7 @@ module InclusionTest {
       inner.getContainerNode().getALocalSource() = DataFlow::parameterNode(callee.getAParameter())
     }
 
+    pragma[assume_small_delta]
     override DataFlow::Node getContainerNode() {
       exists(int arg |
         inner.getContainerNode().getALocalSource() =
@@ -77,6 +78,7 @@ module InclusionTest {
       )
     }
 
+    pragma[assume_small_delta]
     override DataFlow::Node getContainedNode() {
       exists(int arg |
         inner.getContainedNode().getALocalSource() =
diff --git a/javascript/ql/lib/semmle/javascript/StringOps.qll b/javascript/ql/lib/semmle/javascript/StringOps.qll
@@ -67,13 +67,15 @@ module StringOps {
         inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getAParameter()
       }
 
+      pragma[assume_small_delta]
       override DataFlow::Node getBaseString() {
         exists(int arg |
           inner.getBaseString().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and
           result = this.getArgument(arg)
         )
       }
 
+      pragma[assume_small_delta]
       override DataFlow::Node getSubstring() {
         exists(int arg |
           inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and
@@ -292,13 +294,15 @@ module StringOps {
         inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getAParameter()
       }
 
+      pragma[assume_small_delta]
       override DataFlow::Node getBaseString() {
         exists(int arg |
           inner.getBaseString().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and
           result = this.getArgument(arg)
         )
       }
 
+      pragma[assume_small_delta]
       override DataFlow::Node getSubstring() {
         exists(int arg |
           inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ module InclusionTest {`
`69`	`69`	`inner.getContainerNode().getALocalSource() = DataFlow::parameterNode(callee.getAParameter())`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ pragma[assume_small_delta]`
`72`	`73`	`override DataFlow::Node getContainerNode() {`
`73`	`74`	`exists(int arg \|`
`74`	`75`	`inner.getContainerNode().getALocalSource() =`
`@@ -77,6 +78,7 @@ module InclusionTest {`
`77`	`78`	`)`
`78`	`79`	`}`
`79`	`80`
	`81`	`+ pragma[assume_small_delta]`
`80`	`82`	`override DataFlow::Node getContainedNode() {`
`81`	`83`	`exists(int arg \|`
`82`	`84`	`inner.getContainedNode().getALocalSource() =`
Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,15 @@ module StringOps {`
`67`	`67`	`inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getAParameter()`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ pragma[assume_small_delta]`
`70`	`71`	`override DataFlow::Node getBaseString() {`
`71`	`72`	`exists(int arg \|`
`72`	`73`	`inner.getBaseString().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and`
`73`	`74`	`result = this.getArgument(arg)`
`74`	`75`	`)`
`75`	`76`	`}`
`76`	`77`
	`78`	`+ pragma[assume_small_delta]`
`77`	`79`	`override DataFlow::Node getSubstring() {`
`78`	`80`	`exists(int arg \|`
`79`	`81`	`inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and`
`@@ -292,13 +294,15 @@ module StringOps {`
`292`	`294`	`inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getAParameter()`
`293`	`295`	`}`
`294`	`296`
	`297`	`+ pragma[assume_small_delta]`
`295`	`298`	`override DataFlow::Node getBaseString() {`
`296`	`299`	`exists(int arg \|`
`297`	`300`	`inner.getBaseString().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and`
`298`	`301`	`result = this.getArgument(arg)`
`299`	`302`	`)`
`300`	`303`	`}`
`301`	`304`
	`305`	`+ pragma[assume_small_delta]`
`302`	`306`	`override DataFlow::Node getSubstring() {`
`303`	`307`	`exists(int arg \|`
`304`	`308`	`inner.getSubstring().getALocalSource().getEnclosingExpr() = callee.getParameter(arg) and`