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

Commit 8508e663 authored by Tzuhao Tseng's avatar Tzuhao Tseng
Browse files

Fix DnsEvent ArrayIndexOutOfBound error 

If both eventCount and eventTypes.length are equal to 1,
then after resizing the eventTypes array, its length remains 1.
Therefore, attempting to access eventTypes[eventCount] = eventType
would result in an ArrayIndexOutOfBoundsException error.

If the length of the eventTypes array remains the same as eventCount
after resizing, then the length of the eventTypes array needs to be
incremented by 1 again.

Test: GOTA test
Bug: 381457920
Change-Id: I7926961e6a94a976524f729d049ee7164a48d233
parent af9fdf0a

core/java/android/net/metrics/DnsEvent.java

+5 −1
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ final public class DnsEvent { 
            return isSuccess;

        }

        if (eventCount == eventTypes.length) {

            resize((int) (1.4 * eventCount));

            int resizeLength = (int) (1.4 * eventCount);

            if (eventCount == resizeLength) {

                resizeLength++;

            }

            resize(resizeLength);

        }

        eventTypes[eventCount] = eventType;

        returnCodes[eventCount] = returnCode;