Skip to content

Commit 2f34588

Browse files
smowtonsmowton
committed
Constructor models: use Argument[-1] for the result, not ReturnValue
1 parent a5220bf commit 2f34588

File tree

1 file changed

+9
-9
lines changed
  • java/ql/src/semmle/code/java/frameworks/apache

1 file changed

+9
-9
lines changed

‎java/ql/src/semmle/code/java/frameworks/apache/Lang.qll

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ private class ApacheStrBuilderModel extends SummaryModelCsv {
221221
override predicate row(string row) {
222222
row =
223223
[
224-
"org.apache.commons.lang3.text;StrBuilder;false;StrBuilder;(java.lang.String);;Argument;ReturnValue;taint",
224+
"org.apache.commons.lang3.text;StrBuilder;false;StrBuilder;(java.lang.String);;Argument;Argument[-1];taint",
225225
"org.apache.commons.lang3.text;StrBuilder;false;append;(char[]);;Argument;Argument[-1];taint",
226226
"org.apache.commons.lang3.text;StrBuilder;false;append;(char[],int,int);;Argument[0];Argument[-1];taint",
227227
"org.apache.commons.lang3.text;StrBuilder;false;append;(java.lang.CharSequence);;Argument;Argument[-1];taint",
@@ -288,7 +288,7 @@ private class ApacheStrBuilderModel extends SummaryModelCsv {
288288
"org.apache.commons.lang3.text;StrBuilder;false;toString;;;Argument[-1];ReturnValue;taint",
289289
"org.apache.commons.lang3.text;StrBuilder;false;toStringBuffer;;;Argument[-1];ReturnValue;taint",
290290
"org.apache.commons.lang3.text;StrBuilder;false;toStringBuilder;;;Argument[-1];ReturnValue;taint",
291-
"org.apache.commons.text;StrBuilder;false;StrBuilder;(java.lang.String);;Argument;ReturnValue;taint",
291+
"org.apache.commons.text;StrBuilder;false;StrBuilder;(java.lang.String);;Argument;Argument[-1];taint",
292292
"org.apache.commons.text;StrBuilder;false;append;(char[]);;Argument;Argument[-1];taint",
293293
"org.apache.commons.text;StrBuilder;false;append;(char[],int,int);;Argument[0];Argument[-1];taint",
294294
"org.apache.commons.text;StrBuilder;false;append;(java.lang.CharSequence);;Argument;Argument[-1];taint",
@@ -355,8 +355,8 @@ private class ApacheStrBuilderModel extends SummaryModelCsv {
355355
"org.apache.commons.text;StrBuilder;false;toString;;;Argument[-1];ReturnValue;taint",
356356
"org.apache.commons.text;StrBuilder;false;toStringBuffer;;;Argument[-1];ReturnValue;taint",
357357
"org.apache.commons.text;StrBuilder;false;toStringBuilder;;;Argument[-1];ReturnValue;taint",
358-
"org.apache.commons.text;TextStringBuilder;false;TextStringBuilder;(java.lang.String);;Argument;ReturnValue;taint",
359-
"org.apache.commons.text;TextStringBuilder;false;TextStringBuilder;(java.lang.CharSequence);;Argument;ReturnValue;taint",
358+
"org.apache.commons.text;TextStringBuilder;false;TextStringBuilder;(java.lang.String);;Argument;Argument[-1];taint",
359+
"org.apache.commons.text;TextStringBuilder;false;TextStringBuilder;(java.lang.CharSequence);;Argument;Argument[-1];taint",
360360
"org.apache.commons.text;TextStringBuilder;false;append;(char[]);;Argument;Argument[-1];taint",
361361
"org.apache.commons.text;TextStringBuilder;false;append;(char[],int,int);;Argument[0];Argument[-1];taint",
362362
"org.apache.commons.text;TextStringBuilder;false;append;(java.lang.CharSequence);;Argument;Argument[-1];taint",
@@ -471,7 +471,7 @@ private class ApacheStrTokenizerModel extends SummaryModelCsv {
471471
override predicate row(string row) {
472472
row =
473473
[
474-
"org.apache.commons.lang3.text;StrTokenizer;false;StrTokenizer;;;Argument[0];ReturnValue;taint",
474+
"org.apache.commons.lang3.text;StrTokenizer;false;StrTokenizer;;;Argument[0];Argument[-1];taint",
475475
"org.apache.commons.lang3.text;StrTokenizer;false;clone;;;Argument[-1];ReturnValue;taint",
476476
"org.apache.commons.lang3.text;StrTokenizer;false;toString;;;Argument[-1];ReturnValue;taint",
477477
"org.apache.commons.lang3.text;StrTokenizer;false;reset;;;Argument;ReturnValue;taint",
@@ -485,7 +485,7 @@ private class ApacheStrTokenizerModel extends SummaryModelCsv {
485485
"org.apache.commons.lang3.text;StrTokenizer;false;nextToken;;;Argument[-1];ReturnValue;taint",
486486
"org.apache.commons.lang3.text;StrTokenizer;false;getTSVInstance;;;Argument;ReturnValue;taint",
487487
"org.apache.commons.lang3.text;StrTokenizer;false;getCSVInstance;;;Argument;ReturnValue;taint",
488-
"org.apache.commons.text;StrTokenizer;false;StrTokenizer;;;Argument[0];ReturnValue;taint",
488+
"org.apache.commons.text;StrTokenizer;false;StrTokenizer;;;Argument[0];Argument[-1];taint",
489489
"org.apache.commons.text;StrTokenizer;false;clone;;;Argument[-1];ReturnValue;taint",
490490
"org.apache.commons.text;StrTokenizer;false;toString;;;Argument[-1];ReturnValue;taint",
491491
"org.apache.commons.text;StrTokenizer;false;reset;;;Argument;ReturnValue;taint",
@@ -499,7 +499,7 @@ private class ApacheStrTokenizerModel extends SummaryModelCsv {
499499
"org.apache.commons.text;StrTokenizer;false;nextToken;;;Argument[-1];ReturnValue;taint",
500500
"org.apache.commons.text;StrTokenizer;false;getTSVInstance;;;Argument;ReturnValue;taint",
501501
"org.apache.commons.text;StrTokenizer;false;getCSVInstance;;;Argument;ReturnValue;taint",
502-
"org.apache.commons.text;StringTokenizer;false;StringTokenizer;;;Argument[0];ReturnValue;taint",
502+
"org.apache.commons.text;StringTokenizer;false;StringTokenizer;;;Argument[0];Argument[-1];taint",
503503
"org.apache.commons.text;StringTokenizer;false;clone;;;Argument[-1];ReturnValue;taint",
504504
"org.apache.commons.text;StringTokenizer;false;toString;;;Argument[-1];ReturnValue;taint",
505505
"org.apache.commons.text;StringTokenizer;false;reset;;;Argument;ReturnValue;taint",
@@ -539,7 +539,7 @@ private class ApacheStrSubstitutorModel extends SummaryModelCsv {
539539
override predicate row(string row) {
540540
row =
541541
[
542-
"org.apache.commons.lang3.text;StrSubstitutor;false;StrSubstitutor;;;Argument[0];ReturnValue;taint",
542+
"org.apache.commons.lang3.text;StrSubstitutor;false;StrSubstitutor;;;Argument[0];Argument[-1];taint",
543543
"org.apache.commons.lang3.text;StrSubstitutor;false;replace;;;Argument[-1];ReturnValue;taint",
544544
"org.apache.commons.lang3.text;StrSubstitutor;false;replace;(java.lang.Object);;Argument;ReturnValue;taint",
545545
"org.apache.commons.lang3.text;StrSubstitutor;false;replace;(char[]);;Argument;ReturnValue;taint",
@@ -563,7 +563,7 @@ private class ApacheStrSubstitutorModel extends SummaryModelCsv {
563563
"org.apache.commons.lang3.text;StrSubstitutor;false;replaceIn;(java.lang.StringBuilder);;Argument[-1];Argument;taint",
564564
"org.apache.commons.lang3.text;StrSubstitutor;false;replaceIn;(java.lang.StringBuilder,int,int);;Argument[-1];Argument[0];taint",
565565
"org.apache.commons.lang3.text;StrSubstitutor;false;replaceIn;(org.apache.commons.lang3.text.StrBuilder,int,int);;Argument[-1];Argument[0];taint",
566-
"org.apache.commons.text;StringSubstitutor;false;StringSubstitutor;;;Argument[0];ReturnValue;taint",
566+
"org.apache.commons.text;StringSubstitutor;false;StringSubstitutor;;;Argument[0];Argument[-1];taint",
567567
"org.apache.commons.text;StringSubstitutor;false;replace;;;Argument[-1];ReturnValue;taint",
568568
"org.apache.commons.text;StringSubstitutor;false;replace;(java.lang.Object);;Argument;ReturnValue;taint",
569569
"org.apache.commons.text;StringSubstitutor;false;replace;(char[]);;Argument;ReturnValue;taint",

0 commit comments

Comments
 (0)