TEMP: Fix joins.

github · Aug 1, 2023 · 854cff5 · 854cff5
1 parent 03b72eb
commit 854cff5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/RangeAnalysisImpl.qll b/...ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/RangeAnalysisImpl.qll
@@ -83,6 +83,7 @@ private RelativeStage::SemReason relativeReason(SemReason reason) {
 import Public
 
 module Public {
+  pragma[nomagic]
   predicate semBounded(
     SemExpr e, SemanticBound::SemBound b, float delta, boolean upper, SemReason reason
   ) {

diff --git a/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/RangeAnalysisUtil.qll b/cpp/ql/lib/semmle/code/cpp/security/InvalidPointerDereference/RangeAnalysisUtil.qll
@@ -14,14 +14,19 @@ private Instruction getABoundIn(SemBound b, IRFunction func) {
   result.getEnclosingIRFunction() = func
 }
 
+pragma[nomagic]
+private predicate upperBoundedByValue(Instruction i, SemBound bound, int delta) {
+  semBounded(getSemanticExpr(i), bound, delta, true,
+    any(SemReason reason | not reason instanceof SemTypeReason))
+}
+
 /**
  * Holds if `i <= b + delta`.
  */
 pragma[inline]
 private predicate boundedImpl(Instruction i, Instruction b, int delta) {
   exists(SemBound bound, IRFunction func |
-    semBounded(getSemanticExpr(i), bound, delta, true,
-      any(SemReason reason | not reason instanceof SemTypeReason)) and
+    upperBoundedByValue(i, bound, delta) and
     b = getABoundIn(bound, func) and
     i.getEnclosingIRFunction() = func
   )

diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql b/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql
@@ -22,14 +22,19 @@ Instruction getABoundIn(SemBound b, IRFunction func) {
   result.getEnclosingIRFunction() = func
 }
 
+pragma[nomagic]
+private predicate upperBoundedByValue(Instruction i, SemBound bound, int delta) {
+  semBounded(getSemanticExpr(i), bound, delta, true,
+    any(SemReason reason | not reason instanceof SemTypeReason))
+}
+
 /**
  * Holds if `i <= b + delta`.
  */
 pragma[inline]
 predicate boundedImpl(Instruction i, Instruction b, int delta) {
   exists(SemBound bound, IRFunction func |
-    semBounded(getSemanticExpr(i), bound, delta, true,
-      any(SemReason reason | not reason instanceof SemTypeReason)) and
+    upperBoundedByValue(i, bound, delta) and
     b = getABoundIn(bound, func) and
     pragma[only_bind_out](i.getEnclosingIRFunction()) = func
   )