Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev am: 0dcc5c6eb5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24057913

Change-Id: Idab79d3772b506b3a453a135efb71f9b670eda50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kunal Malhotra
2023-07-27 21:56:26 +00:00
committed by Automerger Merge Worker
parent 8451e9a0c7 0dcc5c6eb5
commit 799e127b0b
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/database/DatabaseUtils.java
View File

@@ -511,17 +511,31 @@ public class DatabaseUtils {
*/ */
public static void appendEscapedSQLString(StringBuilder sb, String sqlString) { public static void appendEscapedSQLString(StringBuilder sb, String sqlString) {
sb.append('\''); sb.append('\'');
if (sqlString.indexOf('\'') != -1) { int length = sqlString.length();
int length = sqlString.length(); for (int i = 0; i < length; i++) {
for (int i = 0; i < length; i++) { char c = sqlString.charAt(i);
char c = sqlString.charAt(i); if (Character.isHighSurrogate(c)) {
if (c == '\'') { if (i == length - 1) {
sb.append('\''); continue;
}
if (Character.isLowSurrogate(sqlString.charAt(i + 1))) {
// add them both
sb.append(c);
sb.append(sqlString.charAt(i + 1));
continue;
} else {
// this is a lone surrogate, skip it
continue;
} }
sb.append(c);
} }
} else if (Character.isLowSurrogate(c)) {
sb.append(sqlString); continue;
}
if (c == '\'') {
sb.append('\'');
}
sb.append(c);
}
sb.append('\''); sb.append('\'');
} }