Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cf6036f

Browse files
committed
Java: fix some android database sinks
1 parent 061c2a7 commit cf6036f

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

  • java/ql

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ private class QueryMethod extends SQLiteRunner {
5252
this.getName() = "query" and
5353
(
5454
if this.getParameter(0).getType() instanceof TypeString
55-
then result = [2, 4, 5, 6, 7]
56-
else result = [3, 5, 6, 7, 8]
55+
then result = [0, 1, 2, 4, 5, 6, 7]
56+
else result = [1, 2, 3, 5, 6, 7, 8]
5757
)
5858
or
5959
// queryWithFactory(SQLiteDatabase.CursorFactory cursorFactory, boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit, CancellationSignal cancellationSignal)
6060
// queryWithFactory(SQLiteDatabase.CursorFactory cursorFactory, boolean distinct, String table, String[] columns, String selection, String[] selectionArgs, String groupBy, String having, String orderBy, String limit)
61-
this.getName() = "queryWithFactory" and result = [4, 6, 7, 8, 9]
61+
this.getName() = "queryWithFactory" and result = [2, 3, 4, 6, 7, 8, 9]
6262
}
6363
}
6464

@@ -171,7 +171,7 @@ private class QueryBuilderQueryMethod extends SQLiteRunner {
171171
this.hasName("query")
172172
}
173173

174-
override int sqlIndex() { result = [-1, 3, 5, 6, 7, 8] }
174+
override int sqlIndex() { result = [-1, 2, 4, 5, 6, 7] }
175175
}
176176

177177
private class QueryBuilderUpdateMethod extends SQLiteRunner {

java/ql/test/library-tests/frameworks/android/taint-database/sinks.expected

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,63 @@
88
| Sinks.java:69:18:69:20 | sql |
99
| Sinks.java:75:18:75:20 | sql |
1010
| Sinks.java:82:3:82:8 | target |
11+
| Sinks.java:95:26:95:30 | table |
12+
| Sinks.java:95:33:95:39 | columns |
1113
| Sinks.java:95:42:95:50 | selection |
1214
| Sinks.java:95:68:95:74 | groupBy |
1315
| Sinks.java:95:77:95:82 | having |
1416
| Sinks.java:95:85:95:91 | orderBy |
1517
| Sinks.java:95:94:95:98 | limit |
18+
| Sinks.java:109:26:109:30 | table |
19+
| Sinks.java:109:33:109:39 | columns |
1620
| Sinks.java:109:42:109:50 | selection |
1721
| Sinks.java:109:68:109:74 | groupBy |
1822
| Sinks.java:109:77:109:82 | having |
1923
| Sinks.java:109:85:109:91 | orderBy |
2024
| Sinks.java:109:94:109:98 | limit |
25+
| Sinks.java:121:16:121:20 | table |
26+
| Sinks.java:121:23:121:29 | columns |
2127
| Sinks.java:121:32:121:40 | selection |
2228
| Sinks.java:121:58:121:64 | groupBy |
2329
| Sinks.java:121:67:121:72 | having |
2430
| Sinks.java:121:75:121:81 | orderBy |
31+
| Sinks.java:133:16:133:20 | table |
32+
| Sinks.java:133:23:133:29 | columns |
2533
| Sinks.java:133:32:133:40 | selection |
2634
| Sinks.java:133:58:133:64 | groupBy |
2735
| Sinks.java:133:67:133:72 | having |
2836
| Sinks.java:133:75:133:81 | orderBy |
2937
| Sinks.java:133:84:133:88 | limit |
3038
| Sinks.java:145:3:145:8 | target |
31-
| Sinks.java:145:45:145:57 | selectionArgs |
39+
| Sinks.java:145:34:145:42 | selection |
40+
| Sinks.java:145:60:145:66 | groupBy |
3241
| Sinks.java:145:69:145:74 | having |
3342
| Sinks.java:145:77:145:85 | sortOrder |
3443
| Sinks.java:158:3:158:8 | target |
35-
| Sinks.java:158:45:158:57 | selectionArgs |
44+
| Sinks.java:158:34:158:42 | selection |
45+
| Sinks.java:158:60:158:66 | groupBy |
3646
| Sinks.java:158:69:158:74 | having |
3747
| Sinks.java:158:77:158:85 | sortOrder |
3848
| Sinks.java:158:88:158:92 | limit |
3949
| Sinks.java:172:3:172:8 | target |
40-
| Sinks.java:172:45:172:57 | selectionArgs |
50+
| Sinks.java:172:34:172:42 | selection |
51+
| Sinks.java:172:60:172:66 | groupBy |
4152
| Sinks.java:172:69:172:74 | having |
4253
| Sinks.java:172:77:172:85 | sortOrder |
4354
| Sinks.java:172:88:172:92 | limit |
44-
| Sinks.java:172:95:172:112 | cancellationSignal |
4555
| Sinks.java:181:33:181:41 | selection |
4656
| Sinks.java:191:33:191:41 | selection |
4757
| Sinks.java:200:33:200:41 | selection |
4858
| Sinks.java:210:33:210:41 | selection |
59+
| Sinks.java:224:52:224:56 | table |
60+
| Sinks.java:224:59:224:65 | columns |
4961
| Sinks.java:224:68:224:76 | selection |
5062
| Sinks.java:224:94:224:100 | groupBy |
5163
| Sinks.java:224:103:224:108 | having |
5264
| Sinks.java:225:5:225:11 | orderBy |
5365
| Sinks.java:225:14:225:18 | limit |
66+
| Sinks.java:240:52:240:56 | table |
67+
| Sinks.java:240:59:240:65 | columns |
5468
| Sinks.java:240:68:240:76 | selection |
5569
| Sinks.java:240:94:240:100 | groupBy |
5670
| Sinks.java:240:103:240:108 | having |

0 commit comments

Comments
 (0)