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

Commit 8c959cde authored by Ling Ma's avatar Ling Ma
Browse files

setProperty check for byte limit 

Test: manual
Bug: 210502588
Change-Id: I75a1e5bbd79814429dfac5b0b6449efd72176c2c
parent d9e8a4f5

core/java/android/os/SystemProperties.java

+3 −2
Original line number Diff line number Diff line
@@ -226,9 +226,10 @@ public class SystemProperties { 
     */

    @UnsupportedAppUsage

    public static void set(@NonNull String key, @Nullable String val) {

        if (val != null && !key.startsWith("ro.") && val.length() > PROP_VALUE_MAX) {

        if (val != null && !key.startsWith("ro.") && val.getBytes(StandardCharsets.UTF_8).length

                > PROP_VALUE_MAX) {

            throw new IllegalArgumentException("value of system property '" + key

                    + "' is longer than " + PROP_VALUE_MAX + " characters: " + val);

                    + "' is longer than " + PROP_VALUE_MAX + " bytes: " + val);

        }

        if (TRACK_KEY_ACCESS) onKeyAccess(key);

        native_set(key, val);