C++: Fix FormatLiteral.getMaxConvertedLength bug.

geoffw0 · geoffw0 · commit 0d030d2b1315 · 2022-10-21T17:29:55.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
@@ -1125,12 +1125,12 @@ class FormatLiteral extends Literal {
         exists(int dot, int afterdot |
           (if this.getPrecision(n) = 0 then dot = 0 else dot = 1) and
           (
-            (
-              if this.hasExplicitPrecision(n)
-              then afterdot = this.getPrecision(n)
-              else not this.hasImplicitPrecision(n)
-            ) and
-            afterdot = 6
+            if this.hasExplicitPrecision(n)
+            then afterdot = this.getPrecision(n)
+            else (
+              not this.hasImplicitPrecision(n) and
+              afterdot = 6
+            )
           ) and
           len = 1 + 309 + dot + afterdot
         ) and
@@ -1140,12 +1140,12 @@ class FormatLiteral extends Literal {
         exists(int dot, int afterdot |
           (if this.getPrecision(n) = 0 then dot = 0 else dot = 1) and
           (
-            (
-              if this.hasExplicitPrecision(n)
-              then afterdot = this.getPrecision(n)
-              else not this.hasImplicitPrecision(n)
-            ) and
-            afterdot = 6
+            if this.hasExplicitPrecision(n)
+            then afterdot = this.getPrecision(n)
+            else (
+              not this.hasImplicitPrecision(n) and
+              afterdot = 6
+            )
           ) and
           len = 1 + 1 + dot + afterdot + 1 + 1 + 3
         ) and
@@ -1155,12 +1155,12 @@ class FormatLiteral extends Literal {
         exists(int dot, int afterdot |
           (if this.getPrecision(n) = 0 then dot = 0 else dot = 1) and
           (
-            (
-              if this.hasExplicitPrecision(n)
-              then afterdot = this.getPrecision(n)
-              else not this.hasImplicitPrecision(n)
-            ) and
-            afterdot = 6
+            if this.hasExplicitPrecision(n)
+            then afterdot = this.getPrecision(n)
+            else (
+              not this.hasImplicitPrecision(n) and
+              afterdot = 6
+            )
           ) and
           // note: this could be displayed in the style %e or %f;
           //       however %f is only used when 'P > X >= -4'
diff --git a/cpp/ql/test/library-tests/printf/formatLiteral/formatLiteral.expected b/cpp/ql/test/library-tests/printf/formatLiteral/formatLiteral.expected
@@ -20,7 +20,7 @@
 | test.c:39:9:39:12 | %o | 12 |
 | test.c:40:9:40:13 | %#o | 13 |
 | test.c:43:9:43:12 | %f | 318 |
-| test.c:44:9:44:14 | %.2f |  |
+| test.c:44:9:44:14 | %.2f | 314 |
 | test.c:45:9:45:12 | %e | 15 |
 | test.c:59:10:59:14 | %Ii | 12 |
 | test.c:66:10:66:14 | %zu | 21 |
@@ -37,17 +37,17 @@
 | test.c:101:10:101:15 | %%%% | 3 |
 | test.c:102:10:102:15 | %%%f | 319 |
 | test.c:103:10:103:17 | %%%%%f | 320 |
-| test.c:104:10:104:18 | %4.2f%% |  |
+| test.c:104:10:104:18 | %4.2f%% | 315 |
 | test.c:105:10:105:17 | %%%f%% | 320 |
 | test.c:112:10:112:13 | %f | 318 |
-| test.c:113:10:113:15 | %.1f |  |
+| test.c:113:10:113:15 | %.1f | 313 |
 | test.c:114:10:114:14 | %1f | 318 |
-| test.c:115:10:115:16 | %1.1f |  |
+| test.c:115:10:115:16 | %1.1f | 313 |
 | test.c:116:10:116:13 | %e | 15 |
-| test.c:117:10:117:15 | %.2e |  |
+| test.c:117:10:117:15 | %.2e | 11 |
 | test.c:118:10:118:14 | %3e | 15 |
-| test.c:119:10:119:16 | %3.2e |  |
+| test.c:119:10:119:16 | %3.2e | 11 |
 | test.c:120:10:120:13 | %g | 15 |
-| test.c:121:10:121:15 | %.1g |  |
+| test.c:121:10:121:15 | %.1g | 10 |
 | test.c:122:10:122:14 | %4g | 15 |
-| test.c:123:10:123:16 | %4.1g |  |
+| test.c:123:10:123:16 | %4.1g | 10 |
