CPP: Fix merge.

geoffw0 · geoffw0 · commit 09ce95575afd · 2019-05-01T09:08:44.000+01:00
diff --git a/cpp/ql/src/Critical/OverflowCalculated.ql b/cpp/ql/src/Critical/OverflowCalculated.ql
@@ -29,11 +29,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 |
     add.getAChild() = strlen and

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,6 @@ class MallocCall extends FunctionCall {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-predicate terminationProblem(MallocCall malloc, string msg) {`
`33`		`- malloc.getAllocatedSize() instanceof StrlenCall and`
`34`		`- msg = "This allocation does not include space to null-terminate the string."`
`35`		`-}`
`36`		`-`
`37`	`32`	`predicate spaceProblem(FunctionCall append, string msg) {`
`38`	`33`	`exists(MallocCall malloc, StrlenCall strlen, AddExpr add, FunctionCall insert, Variable buffer \|`
`39`	`34`	`add.getAChild() = strlen and`