hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix and document one-based argument indexing in StringFormat's getAnArgUsageOffset

Browse Source
This commit is contained in:
Chris Smowton
2021-06-08 13:15:01 +01:00
parent 55c72cebf2
commit 0f2139ff5d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/ql/src/semmle/code/java/StringFormat.qll
View File

@@ -368,7 +368,7 @@ class FormatString extends string {
/*abstract*/ int getASkippedFmtSpecIndex() { none() }
/**
* Gets an offset in this format string where argument `argNo` will be interpolated, if any.
* Gets an offset (zero-based) in this format string where argument `argNo` (1-based) will be interpolated, if any.
*/
int getAnArgUsageOffset(int argNo) { none() }
}
@@ -451,7 +451,6 @@ private class PrintfFormatString extends FormatString {
override int getAnArgUsageOffset(int argNo) {
argNo = fmtSpecRefersToSpecificIndex(result)
or
fmtSpecRefersToSequentialIndex(result) and
result = rank[argNo](int i | fmtSpecRefersToSequentialIndex(i))
or
fmtSpecRefersToPrevious(result) and
@@ -485,8 +484,5 @@ private class LoggerFormatString extends FormatString {
override int getMaxFmtSpecIndex() { result = count(int i | fmtPlaceholder(i)) }
override int getAnArgUsageOffset(int argNo) {
fmtPlaceholder(result) and
argNo = count(int i | fmtPlaceholder(i) and i < result)
}
override int getAnArgUsageOffset(int argNo) { result = rank[argNo](int i | fmtPlaceholder(i)) }
}