C++: Simplify mayAddNullTerminator.

geoffw0 · geoffw0 · commit d41e5177572a · 2021-10-01T14:15:05.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/NullTermination.qll b/cpp/ql/lib/semmle/code/cpp/commons/NullTermination.qll
@@ -54,7 +54,7 @@ predicate mayAddNullTerminator(Expr e, VariableAccess va) {
     not functionArgumentMustBeNullTerminated(f, i) and
     c.getAnArgumentSubExpr(i) = va
   |
-    not f.hasEntryPoint() and not functionArgumentMustBeNullTerminated(f, i)
+    not f.hasEntryPoint()
     or
     mayAddNullTerminator(_, f.getParameter(i).getAnAccess())
     or

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ predicate mayAddNullTerminator(Expr e, VariableAccess va) {`
`54`	`54`	`not functionArgumentMustBeNullTerminated(f, i) and`
`55`	`55`	`c.getAnArgumentSubExpr(i) = va`
`56`	`56`	`\|`
`57`		`- not f.hasEntryPoint() and not functionArgumentMustBeNullTerminated(f, i)`
	`57`	`+ not f.hasEntryPoint()`
`58`	`58`	`or`
`59`	`59`	`mayAddNullTerminator(_, f.getParameter(i).getAnAccess())`
`60`	`60`	`or`