CPP: Improve wording of UnsafeArrayForDAysOfYear.ql.

geoffw0 · geoffw0 · commit 627fba81ce4b · 2019-06-25T14:42:18.000+01:00
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql b/cpp/ql/src/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear.ql
@@ -16,22 +16,26 @@ class LeapYearUnsafeDaysOfTheYearArrayType extends ArrayType {
   LeapYearUnsafeDaysOfTheYearArrayType() { this.getArraySize() = 365 }
 }
 
-from Element element
+from Element element, string allocType
 where
   exists(NewArrayExpr nae |
     element = nae and
-    nae.getAllocatedType() instanceof LeapYearUnsafeDaysOfTheYearArrayType
+    nae.getAllocatedType() instanceof LeapYearUnsafeDaysOfTheYearArrayType and
+    allocType = "an array allocation"
   )
   or
   exists(Variable var |
     var = element and
-    var.getType() instanceof LeapYearUnsafeDaysOfTheYearArrayType
+    var.getType() instanceof LeapYearUnsafeDaysOfTheYearArrayType and
+    allocType = "an array allocation"
   )
   or
   exists(ConstructorCall cc |
     element = cc and
     cc.getTarget().hasName("vector") and
-    cc.getArgument(0).getValue().toInt() = 365
+    cc.getArgument(0).getValue().toInt() = 365 and
+    allocType = "a std::vector allocation"
   )
 select element,
-  "There is an array or std::vector allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios."
+  "There is " + allocType +
+    " with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios."
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/UnsafeArrayForDaysOfYear.expected b/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UnsafeArrayForDaysOfYear/UnsafeArrayForDaysOfYear.expected
@@ -1,3 +1,3 @@
-| test.cpp:17:6:17:10 | items | There is an array or std::vector allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
-| test.cpp:25:15:25:26 | new[] | There is an array or std::vector allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
-| test.cpp:52:20:52:23 | call to vector | There is an array or std::vector allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
+| test.cpp:17:6:17:10 | items | There is an array allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
+| test.cpp:25:15:25:26 | new[] | There is an array allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
+| test.cpp:52:20:52:23 | call to vector | There is a std::vector allocation with a hard-coded set of 365 elements, which may indicate the number of days in a year without considering leap year scenarios. |
