use if-else in ReDoSUtil::getCanonicalizationFlags

erik-krogh · esbena · web-flow · commit 75a3f34e86e0 · 2021-09-01T12:44:02.000+02:00
Co-authored-by: Esben Sparre Andreasen &lt;esbena@github.com&gt;
diff --git a/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll b/javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll
@@ -187,11 +187,10 @@ private predicate isCanonicalTerm(RelevantRegExpTerm term, string str) {
 string getCanonicalizationFlags(RegExpTerm root) {
   root.isRootTerm() and
   (
-    RegExpFlags::isIgnoreCase(root) and
-    result = "i"
-    or
-    not RegExpFlags::isIgnoreCase(root) and
-    result = ""
+    if RegExpFlags::isIgnoreCase(root) then
+      result = "i"
+    else
+      result = ""
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,10 @@ private predicate isCanonicalTerm(RelevantRegExpTerm term, string str) {`
`187`	`187`	`string getCanonicalizationFlags(RegExpTerm root) {`
`188`	`188`	`root.isRootTerm() and`
`189`	`189`	`(`
`190`		`- RegExpFlags::isIgnoreCase(root) and`
`191`		`- result = "i"`
`192`		`- or`
`193`		`- not RegExpFlags::isIgnoreCase(root) and`
`194`		`- result = ""`
	`190`	`+ if RegExpFlags::isIgnoreCase(root) then`
	`191`	`+ result = "i"`
	`192`	`+ else`
	`193`	`+ result = ""`
`195`	`194`	`)`
`196`	`195`	`}`
`197`	`196`