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

Commit d142df53 authored by Kenny Root's avatar Kenny Root
Browse files

Prevent sign extension in IccUtils.parseToRGB 

When a signed byte value is taken from an array, make sure to truncate
it so it doesn't have a problem when it's sign extended to 32-bit.

Change-Id: Ic2b35c317e21c63dff960501145a4f3074b687ad
parent a4437fc9

telephony/java/com/android/internal/telephony/IccUtils.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -397,7 +397,7 @@ public class IccUtils { 
        int bits = data[valueIndex++] & 0xFF;

        int bits = data[valueIndex++] & 0xFF;

        int colorNumber = data[valueIndex++] & 0xFF;

        int colorNumber = data[valueIndex++] & 0xFF;

        int clutOffset = ((data[valueIndex++] & 0xFF) << 8)

        int clutOffset = ((data[valueIndex++] & 0xFF) << 8)

                | data[valueIndex++];

                | (data[valueIndex++] & 0xFF);

        length = length - 6;

        length = length - 6;





        int[] colorIndexArray = getCLUT(data, clutOffset, colorNumber);

        int[] colorIndexArray = getCLUT(data, clutOffset, colorNumber);