Skip to content

Commit 0d4f8ae

Browse files
joefarebrotherjoefarebrother
committed
Use Argument ranges in CSV rows
1 parent 7926d16 commit 0d4f8ae

File tree

1 file changed

+21
-64
lines changed
  • java/ql/src/semmle/code/java/frameworks/android

1 file changed

+21
-64
lines changed

‎java/ql/src/semmle/code/java/frameworks/android/SQLite.qll‎

Lines changed: 21 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,23 @@ private class SQLiteSinkCsv extends SinkModelCsv {
4040
// queryWithFactory(SQLiteDatabase.CursorFactory cursorFactory, boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit, CancellationSignal cancellationSignal)
4141
// queryWithFactory(SQLiteDatabase.CursorFactory cursorFactory, boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit)
4242
// Each String / String[] arg except for selectionArgs is a sink
43-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[0];sql",
44-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[1];sql",
45-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[2];sql",
46-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[4];sql",
47-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[5];sql",
48-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[6];sql",
49-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[7];sql",
50-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[0];sql",
51-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[1];sql",
52-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[2];sql",
53-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[4];sql",
54-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[5];sql",
55-
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[6];sql",
56-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[1];sql",
57-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[2];sql",
58-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[3];sql",
59-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[5];sql",
60-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[6];sql",
61-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[7];sql",
62-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[8];sql",
63-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[1];sql",
64-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[2];sql",
65-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[3];sql",
66-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[5];sql",
67-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[6];sql",
68-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[7];sql",
69-
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[8];sql",
70-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[2];sql",
71-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[3];sql",
72-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[4];sql",
73-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[6];sql",
74-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[7];sql",
75-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[8];sql",
76-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[9];sql",
77-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[2];sql",
78-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[3];sql",
79-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[4];sql",
80-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[6];sql",
81-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[7];sql",
82-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[8];sql",
83-
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[9];sql",
43+
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[0..2];sql",
44+
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String,String);;Argument[4..7];sql",
45+
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[0..2];sql",
46+
"android.database.sqlite;SQLiteDatabase;false;query;(String,String[],String,String[],String,String,String);;Argument[4..6];sql",
47+
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[1..3];sql",
48+
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String);;Argument[5..8];sql",
49+
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[1..3];sql",
50+
"android.database.sqlite;SQLiteDatabase;false;query;(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[5..8];sql",
51+
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[2..4];sql",
52+
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String);;Argument[6..9];sql",
53+
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[2..4];sql",
54+
"android.database.sqlite;SQLiteDatabase;false;queryWithFactory;(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[6..9];sql",
8455
"android.database.sqlite;SQLiteDatabase;false;rawQuery;(String,String[]);;Argument[0];sql",
8556
"android.database.sqlite;SQLiteDatabase;false;rawQuery;(String,String[],CancellationSignal);;Argument[0];sql",
8657
"android.database.sqlite;SQLiteDatabase;false;rawQueryWithFactory;(CursorFactory,String,String[],String);;Argument[1];sql",
8758
"android.database.sqlite;SQLiteDatabase;false;rawQueryWithFactory;(CursorFactory,String,String[],String,CancellationSignal);;Argument[1];sql",
88-
"android.database.sqlite;SQLiteDatabase;false;delete;(String,String,String[]);;Argument[0];sql",
89-
"android.database.sqlite;SQLiteDatabase;false;delete;(String,String,String[]);;Argument[1];sql",
59+
"android.database.sqlite;SQLiteDatabase;false;delete;(String,String,String[]);;Argument[0..1];sql",
9060
"android.database.sqlite;SQLiteDatabase;false;update;(String,ContentValues,String,String[]);;Argument[0];sql",
9161
"android.database.sqlite;SQLiteDatabase;false;update;(String,ContentValues,String,String[]);;Argument[2];sql",
9262
"android.database.sqlite;SQLiteDatabase;false;updateWithOnConflict;(String,ContentValues,String,String[],int);;Argument[0];sql",
@@ -96,10 +66,8 @@ private class SQLiteSinkCsv extends SinkModelCsv {
9666
"android.database;DatabaseUtils;false;blobFileDescriptorForQuery;(SQLiteDatabase,String,String[]);;Argument[1];sql",
9767
"android.database;DatabaseUtils;false;createDbFromSqlStatements;(Context,String,int,String);;Argument[3];sql",
9868
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String);;Argument[1];sql",
99-
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String);;Argument[1];sql",
100-
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String);;Argument[2];sql",
101-
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String,String[]);;Argument[1];sql",
102-
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String,String[]);;Argument[2];sql",
69+
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String);;Argument[1..2];sql",
70+
"android.database;DatabaseUtils;false;queryNumEntries;(SQLiteDatabase,String,String,String[]);;Argument[1..2];sql",
10371
"android.database.sqlite;SQLiteQueryBuilder;false;delete;(SQLiteDatabase,String,String[]);;Argument[-1];sql",
10472
"android.database.sqlite;SQLiteQueryBuilder;false;delete;(SQLiteDatabase,String,String[]);;Argument[1];sql",
10573
"android.database.sqlite;SQLiteQueryBuilder;false;insert;(SQLiteDatabase,ContentValues);;Argument[-1];sql",
@@ -109,25 +77,14 @@ private class SQLiteSinkCsv extends SinkModelCsv {
10977
// query(SQLiteDatabase db, String[] projectionIn, String selection, String[] selectionArgs, String groupBy, String having, String sortOrder, String limit)
11078
// query(SQLiteDatabase db, String[] projectionIn, String selection, String[] selectionArgs, String groupBy, String having, String sortOrder, String limit, CancellationSignal cancellationSignal)
11179
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[-1];sql",
112-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[1];sql",
113-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[2];sql",
114-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[4];sql",
115-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[5];sql",
116-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[6];sql",
80+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[1..2];sql",
81+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String);;Argument[4..6];sql",
11782
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[-1];sql",
118-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[1];sql",
119-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[2];sql",
120-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[4];sql",
121-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[5];sql",
122-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[6];sql",
123-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[7];sql",
83+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[1..2];sql",
84+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String);;Argument[4..7];sql",
12485
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[-1];sql",
125-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[1];sql",
126-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[2];sql",
127-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[4];sql",
128-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[5];sql",
129-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[6];sql",
130-
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[7];sql",
86+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[1..2];sql",
87+
"android.database.sqlite;SQLiteQueryBuilder;false;query;(SQLiteDatabase,String[],String,String[],String,String,String,String,CancellationSignal);;Argument[4..7];sql",
13188
"android.content;ContentProvider;true;delete;(Uri,String,String[]);;Argument[1];sql",
13289
"android.content;ContentProvider;true;update;(Uri,ContentValues,String,String[]);;Argument[2];sql",
13390
"android.content;ContentProvider;true;query;(Uri,String[],String,String[],String,CancellationSignal);;Argument[2];sql",

0 commit comments

Comments
 (0)