Update python/ql/src/semmle/python/RegexTreeView.qll

erik-krogh · yoff · web-flow · commit e962a7c77ce9 · 2021-08-16T11:24:05.000+02:00
Co-authored-by: yoff &lt;lerchedahl@gmail.com&gt;
diff --git a/python/ql/src/semmle/python/RegexTreeView.qll b/python/ql/src/semmle/python/RegexTreeView.qll
@@ -839,9 +839,11 @@ class RegExpSubPattern extends RegExpZeroWidthMatch {
 
   /** Gets the lookahead term. */
   RegExpTerm getOperand() {
-    result.getRegex() = re and
-    result.getStart() = start + 3 and
-    result.getEnd() = end - 1
+    exists(int in_start, int in_end | re.groupContents(start, end, in_start, in_end) |
+      result.getRegex() = re and
+      result.getStart() = in_start and
+      result.getEnd() = in_end
+    )
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -839,9 +839,11 @@ class RegExpSubPattern extends RegExpZeroWidthMatch {`
`839`	`839`
`840`	`840`	`/** Gets the lookahead term. */`
`841`	`841`	`RegExpTerm getOperand() {`
`842`		`- result.getRegex() = re and`
`843`		`- result.getStart() = start + 3 and`
`844`		`- result.getEnd() = end - 1`
	`842`	`+ exists(int in_start, int in_end \| re.groupContents(start, end, in_start, in_end) \|`
	`843`	`+ result.getRegex() = re and`
	`844`	`+ result.getStart() = in_start and`
	`845`	`+ result.getEnd() = in_end`
	`846`	`+ )`
`845`	`847`	`}`
`846`	`848`	`}`
`847`	`849`