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

Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev

Browse Source
This commit is contained in:
Amit Mahajan
2014-09-05 19:25:35 +00:00
committed by Android (Google) Code Review
parent 8eca9e0f0b 9bd196bb42
commit f11b43d8bf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/com/android/internal/telephony/GsmAlphabet.java
View File

@@ -609,16 +609,25 @@ public class GsmAlphabet {
}
} else {
if (prevWasEscape) {
char shiftChar = shiftTableToChar.charAt(c);
char shiftChar =
c < shiftTableToChar.length() ? shiftTableToChar.charAt(c) : ' ';
if (shiftChar == ' ') {
// display character from main table if not present in shift table
ret.append(languageTableToChar.charAt(c));
if (c < languageTableToChar.length()) {
ret.append(languageTableToChar.charAt(c));
} else {
ret.append(' ');
}
} else {
ret.append(shiftChar);
}
} else {
if (!isMbcs || c < 0x80 || i + 1 >= offset + length) {
ret.append(languageTableToChar.charAt(c));
if (c < languageTableToChar.length()) {
ret.append(languageTableToChar.charAt(c));
} else {
ret.append(' ');
}
} else {
// isMbcs must be true. So both mbcsBuffer and charset are initialized.
mbcsBuffer.clear();