CPP: Remove the overlap between these two queries.

geoffw0 · geoffw0 · commit 57a4e52b475e · 2019-04-18T10:33:33.000+01:00
diff --git a/cpp/ql/src/Critical/OverflowCalculated.ql b/cpp/ql/src/Critical/OverflowCalculated.ql
@@ -28,12 +28,6 @@ class MallocCall extends FunctionCall
   }
 }
 
-predicate terminationProblem(MallocCall malloc, string msg)
-{
-  malloc.getAllocatedSize() instanceof StrlenCall and
-  msg = "This allocation does not include space to null-terminate the string."
-}
-
 predicate spaceProblem(FunctionCall append, string msg)
 {
   exists(MallocCall malloc, StrlenCall strlen, AddExpr add, FunctionCall insert, Variable buffer |
@@ -51,5 +45,5 @@ predicate spaceProblem(FunctionCall append, string msg)
 }
 
 from Expr problem, string msg
-where terminationProblem(problem, msg) or spaceProblem(problem, msg)
+where spaceProblem(problem, msg)
 select problem, msg
diff --git a/cpp/ql/test/query-tests/Critical/OverflowCalculated/OverflowCalculated.expected b/cpp/ql/test/query-tests/Critical/OverflowCalculated/OverflowCalculated.expected
@@ -1,6 +1 @@
-| tests1.cpp:26:21:26:26 | call to malloc | This allocation does not include space to null-terminate the string. |
-| tests1.cpp:67:21:67:26 | call to malloc | This allocation does not include space to null-terminate the string. |
-| tests1.cpp:89:25:89:30 | call to malloc | This allocation does not include space to null-terminate the string. |
 | tests2.cpp:34:4:34:9 | call to strcat | This buffer only contains enough room for 'str1' (copied on line 33) |
-| tests3.cpp:25:21:25:31 | call to malloc | This allocation does not include space to null-terminate the string. |
-| tests3.cpp:30:21:30:31 | call to malloc | This allocation does not include space to null-terminate the string. |

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,6 @@ class MallocCall extends FunctionCall`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-predicate terminationProblem(MallocCall malloc, string msg)`
`32`		`-{`
`33`		`- malloc.getAllocatedSize() instanceof StrlenCall and`
`34`		`- msg = "This allocation does not include space to null-terminate the string."`
`35`		`-}`
`36`		`-`
`37`	`31`	`predicate spaceProblem(FunctionCall append, string msg)`
`38`	`32`	`{`
`39`	`33`	`exists(MallocCall malloc, StrlenCall strlen, AddExpr add, FunctionCall insert, Variable buffer \|`
`@@ -51,5 +45,5 @@ predicate spaceProblem(FunctionCall append, string msg)`
`51`	`45`	`}`
`52`	`46`
`53`	`47`	`from Expr problem, string msg`
`54`		`-where terminationProblem(problem, msg) or spaceProblem(problem, msg)`
	`48`	`+where spaceProblem(problem, msg)`
`55`	`49`	`select problem, msg`