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

Commit ed16d4b7 authored by Wei Huang's avatar Wei Huang
Browse files

Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS. 

Change-Id: I0aad5b3d2834695b44cbb63e40c43a2159b723d9
parent 857ce94b

core/java/com/google/android/mms/pdu/PduComposer.java

+3 −0
Original line number Diff line number Diff line
@@ -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