Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceacb727 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev... 

Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into rvc-dev am: 0dcc5c6e am: 799e127b am: ddc2eb9d am: 16658a14 am: 2b3e7ada

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



Change-Id: Ibae9f4593ce4fb917584f3fd503f82ac457c4b7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d2065df 2b3e7ada

core/java/android/database/DatabaseUtils.java

+23 −9
Original line number Diff line number Diff line
@@ -511,17 +511,31 @@ public class DatabaseUtils { 
     */

    public static void appendEscapedSQLString(StringBuilder sb, String sqlString) {

        sb.append('\'');

        if (sqlString.indexOf('\'') != -1) {

        int length = sqlString.length();

        for (int i = 0; i < length; i++) {

            char c = sqlString.charAt(i);

            if (Character.isHighSurrogate(c)) {

                if (i == length - 1) {

                    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;

                }

            }

            if (Character.isLowSurrogate(c)) {

                continue;

            }

            if (c == '\'') {

                sb.append('\'');

            }

            sb.append(c);

        }

        } else

            sb.append(sqlString);

        sb.append('\'');

    }