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

Merge change 26946 into eclair

Browse Source 
* changes:
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
This commit is contained in:
Android (Google) Code Review
2009-09-24 19:13:30 -04:00
parent 0d3999f788 ed16d4b7de
commit d35db5ec8b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/google/android/mms/pdu/PduComposer.java
View File

@@ -19,6 +19,8 @@ package com.google.android.mms.pdu;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.util.Log;
import android.text.TextUtils;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -528,6 +530,7 @@ public class PduComposer {
EncodedStringValue from = mPduHeader.getEncodedStringValue(field); EncodedStringValue from = mPduHeader.getEncodedStringValue(field);
if ((from == null) if ((from == null)
|| TextUtils.isEmpty(from.getString())
|| new String(from.getTextString()).equals( || new String(from.getTextString()).equals(
PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR)) { PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR)) {
// Length of from = 1 // Length of from = 1