diff options
| author | Wei Huang <weih@google.com> | 2009-09-24 15:04:01 -0700 |
|---|---|---|
| committer | Wei Huang <weih@google.com> | 2009-09-24 15:04:01 -0700 |
| commit | ed16d4b7deb767f10db80ba57fca3721ac814c92 (patch) | |
| tree | 4715fa5c04205b8c0a42b1b336f3598d33f066ac /core/java/com/google | |
| parent | 857ce94b88d53c3deb965898098f04fbf42e55e1 (diff) | |
| download | frameworks_base-ed16d4b7deb767f10db80ba57fca3721ac814c92.zip frameworks_base-ed16d4b7deb767f10db80ba57fca3721ac814c92.tar.gz frameworks_base-ed16d4b7deb767f10db80ba57fca3721ac814c92.tar.bz2 | |
Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
Change-Id: I0aad5b3d2834695b44cbb63e40c43a2159b723d9
Diffstat (limited to 'core/java/com/google')
| -rw-r--r-- | core/java/com/google/android/mms/pdu/PduComposer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/google/android/mms/pdu/PduComposer.java b/core/java/com/google/android/mms/pdu/PduComposer.java index 8b31936..2aa5e48 100644 --- a/core/java/com/google/android/mms/pdu/PduComposer.java +++ b/core/java/com/google/android/mms/pdu/PduComposer.java @@ -19,6 +19,8 @@ package com.google.android.mms.pdu; import android.content.ContentResolver; import android.content.Context; +import android.util.Log; +import android.text.TextUtils; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -528,6 +530,7 @@ public class PduComposer { EncodedStringValue from = mPduHeader.getEncodedStringValue(field); if ((from == null) + || TextUtils.isEmpty(from.getString()) || new String(from.getTextString()).equals( PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR)) { // Length of from = 1 |