Skip to content

Commit 3f095db

Browse files
committed
Formatted parameters always a variadic parameter
1 parent f2368a9 commit 3f095db

File tree

8 files changed

+1
-20
lines changed

8 files changed

+1
-20
lines changed

go/ql/lib/semmle/go/StringOps.qll

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,6 @@ module StringOps {
304304
* Gets the parameter index of the format string.
305305
*/
306306
abstract int getFormatStringIndex();
307-
308-
/**
309-
* Gets the parameter index of the first parameter to be formatted.
310-
*/
311-
abstract int getFirstFormattedParameterIndex();
312307
}
313308

314309
/**
@@ -336,7 +331,7 @@ module StringOps {
336331
formatDirective = this.getComponent(n) and
337332
formatDirective.charAt(0) = "%" and
338333
formatDirective.charAt(1) != "%" and
339-
result = this.getArgument((n / 2) + f.getFirstFormattedParameterIndex())
334+
result = this.getImplicitVarargsArgument((n / 2))
340335
}
341336
}
342337
}

go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ module ElazarlGoproxy {
112112
ProxyLogFunction() { this.hasQualifiedName(packagePath(), "ProxyCtx", ["Logf", "Warnf"]) }
113113

114114
override int getFormatStringIndex() { result = 0 }
115-
116-
override int getFirstFormattedParameterIndex() { result = 1 }
117115
}
118116

119117
private class ProxyLog extends LoggerCall::Range, DataFlow::MethodCallNode {

go/ql/lib/semmle/go/frameworks/Glog.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ module Glog {
3939
StringFormatter() { this.getName().matches("%f") }
4040

4141
override int getFormatStringIndex() { result = super.getFirstPrintedArg() }
42-
43-
override int getFirstFormattedParameterIndex() { result = super.getFirstPrintedArg() + 1 }
4442
}
4543

4644
private class GlogCall extends LoggerCall::Range, DataFlow::CallNode {

go/ql/lib/semmle/go/frameworks/Logrus.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,5 @@ module Logrus {
4343
}
4444

4545
override int getFormatStringIndex() { result = argOffset }
46-
47-
override int getFirstFormattedParameterIndex() { result = argOffset + 1 }
4846
}
4947
}

go/ql/lib/semmle/go/frameworks/Spew.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ module Spew {
3131
StringFormatter() { this.getName().matches("%f") }
3232

3333
override int getFormatStringIndex() { result = super.getFirstPrintedArg() }
34-
35-
override int getFirstFormattedParameterIndex() { result = super.getFirstPrintedArg() + 1 }
3634
}
3735

3836
private class SpewCall extends LoggerCall::Range, DataFlow::CallNode {

go/ql/lib/semmle/go/frameworks/Zap.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ module Zap {
3232
ZapFormatter() { this.getName().matches("%f") }
3333

3434
override int getFormatStringIndex() { result = 0 }
35-
36-
override int getFirstFormattedParameterIndex() { result = 1 }
3735
}
3836

3937
/**

go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ module Fmt {
6666
}
6767

6868
override int getFormatStringIndex() { result = argOffset }
69-
70-
override int getFirstFormattedParameterIndex() { result = argOffset + 1 }
7169
}
7270

7371
/** The `Sscan` function or one of its variants. */

go/ql/lib/semmle/go/frameworks/stdlib/Log.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ module Log {
2020
LogFormatter() { this.getName().matches("%f") }
2121

2222
override int getFormatStringIndex() { result = 0 }
23-
24-
override int getFirstFormattedParameterIndex() { result = 1 }
2523
}
2624

2725
private class LogCall extends LoggerCall::Range, DataFlow::CallNode {

0 commit comments

Comments
 (0)