C++: Respond to review comments.

MathiasVP · MathiasVP · commit 75aa1e8a3b34 · 2021-01-28T16:39:11.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Strset.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Strset.qll
@@ -22,6 +22,12 @@ private class StrsetFunction extends ArrayFunction, DataFlowFunction, AliasFunct
       ])
   }
 
+  override predicate hasArrayWithNullTerminator(int bufParam) { bufParam = 0 }
+
+  override predicate hasArrayInput(int bufParam) { bufParam = 0 }
+
+  override predicate hasArrayOutput(int bufParam) { bufParam = 0 }
+
   override predicate hasDataFlow(FunctionInput input, FunctionOutput output) {
     // flow from the character that overrides the string
     input.isParameter(1) and
@@ -49,4 +55,8 @@ private class StrsetFunction extends ArrayFunction, DataFlowFunction, AliasFunct
   override predicate hasSpecificWriteSideEffect(ParameterIndex i, boolean buffer, boolean mustWrite) {
     i = 0 and buffer = true and mustWrite = true
   }
+
+  override predicate hasSpecificReadSideEffect(ParameterIndex i, boolean buffer) {
+    i = 0 and buffer = true
+  }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Strtok.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Strtok.qll
@@ -35,9 +35,9 @@ private class Strtok extends ArrayFunction, AliasFunction, TaintFunction, SideEf
     input.isParameter(0) and output.isReturnValue()
   }
 
-  override predicate hasOnlySpecificReadSideEffects() { any() }
+  override predicate hasOnlySpecificReadSideEffects() { none() }
 
-  override predicate hasOnlySpecificWriteSideEffects() { any() }
+  override predicate hasOnlySpecificWriteSideEffects() { none() }
 
   override predicate hasSpecificWriteSideEffect(ParameterIndex i, boolean buffer, boolean mustWrite) {
     i = 0 and buffer = true and mustWrite = false

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ private class Strtok extends ArrayFunction, AliasFunction, TaintFunction, SideEf`
`35`	`35`	`input.isParameter(0) and output.isReturnValue()`
`36`	`36`	`}`
`37`	`37`
`38`		`- override predicate hasOnlySpecificReadSideEffects() { any() }`
	`38`	`+ override predicate hasOnlySpecificReadSideEffects() { none() }`
`39`	`39`
`40`		`- override predicate hasOnlySpecificWriteSideEffects() { any() }`
	`40`	`+ override predicate hasOnlySpecificWriteSideEffects() { none() }`
`41`	`41`
`42`	`42`	`override predicate hasSpecificWriteSideEffect(ParameterIndex i, boolean buffer, boolean mustWrite) {`
`43`	`43`	`i = 0 and buffer = true and mustWrite = false`