diff options
| author | Hall Liu <hallliu@google.com> | 2020-03-11 15:15:42 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-27 20:56:44 +0000 |
| commit | 6ef16e3840bf5d3c90ab335bcb24daaba212f075 (patch) | |
| tree | 1c71eb3477378bee33a005c337540ccda0baa510 | |
| parent | 4290693f5d7a996311f435cca2babee4212ec22f (diff) | |
| download | base-6ef16e3840bf5d3c90ab335bcb24daaba212f075.tar.gz | |
Allow empty tokens in strict grammar
In SQLiteQueryBuilder, allow empty tokens when checking for invalid
tokens during the strict grammar check.
Fixes: 151151800
Fixes: 161769478
Test: atest SQLiteQueryBuilderTest#testStrictQueryEmptyToken
Change-Id: Iac1cdd643253fd186a164b863d65d6e92698fd38
(cherry picked from commit e409ec2492f47be9a0f3917bbbb324624eec7b5e)
(cherry picked from commit b7cffcab3228c7de9d6450f746cd5066dcfbb621)
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteQueryBuilder.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java index 669d0466fdf2..e9c59f55a418 100644 --- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java +++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java @@ -798,6 +798,7 @@ public class SQLiteQueryBuilder { } private void enforceStrictToken(@NonNull String token) { + if (TextUtils.isEmpty(token)) return; if (isTableOrColumn(token)) return; if (SQLiteTokenizer.isFunction(token)) return; if (SQLiteTokenizer.isType(token)) return; |