mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 04:02:14 +02:00
Code

Avoid StringIndexOutOfBoundsException when the header is broken like "=?us-ascii?q?abc?= =?"

Browse Source
This commit is contained in:
Koji Arai 2012-11-20 00:05:59 +09:00
parent 1c7d7af975
commit 0be299fbd0
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/fsck/k9/mail/internet/DecoderUtil.java
View File

@ -110,24 +110,28 @@ public class DecoderUtil {
while (true) {
int begin = body.indexOf("=?", previousEnd);
if (begin == -1) {
sb.append(body.substring(previousEnd));
return sb.toString();
}
// ANDROID: The mime4j original version has an error here. It gets confused if
// the encoded string begins with an '=' (just after "?Q?"). This patch seeks forward
// to find the two '?' in the "header", before looking for the final "?=".
int endScan = begin + 2;
if (begin != -1) {
int qm1 = body.indexOf('?', endScan + 2);
int qm2 = body.indexOf('?', qm1 + 1);
if (qm2 != -1) {
endScan = qm2 + 1;
}
int qm1 = body.indexOf('?', begin + 2);
if (qm1 == -1) {
sb.append(body.substring(previousEnd));
return sb.toString();
}
int end = begin == -1 ? -1 : body.indexOf("?=", endScan);
if (end == -1) {
if (previousEnd == 0)
return body;
int qm2 = body.indexOf('?', qm1 + 1);
if (qm2 == -1) {
sb.append(body.substring(previousEnd));
return sb.toString();
}
int end = body.indexOf("?=", qm2 + 1);
if (end == -1) {
sb.append(body.substring(previousEnd));
return sb.toString();
}

6
tests/src/com/fsck/k9/mail/internet/DecoderUtilTest.java
View File

@ -57,8 +57,7 @@ public class DecoderUtilTest extends TestCase {
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "=??q?a?=";
expect = "=??q?a?=";
//expect = "a";
expect = "a";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
@ -88,8 +87,7 @@ public class DecoderUtilTest extends TestCase {
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));
body = "=?x?q?X?=";
expect = "=?x?q?X?=";
//expect = "X";
expect = "X";
message = null;
assertEquals(expect, DecoderUtil.decodeEncodedWords(body, message));