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

Merge "Add validity check to detect invalid PDUs." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-14 16:32:33 +00:00
committed by Android (Google) Code Review
parent 1b0e20108d 0445be53de
commit 54b18bd8e8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/common/com/google/android/mms/pdu/PduParser.java
View File

@@ -1550,6 +1550,11 @@ public class PduParser {
if (cur < TEXT_MIN) { if (cur < TEXT_MIN) {
int length = parseValueLength(pduDataStream); int length = parseValueLength(pduDataStream);
int startPos = pduDataStream.available(); int startPos = pduDataStream.available();
if (length > startPos) {
Log.e(LOG_TAG, "parseContentType: Invalid length " + length
+ " when available bytes are " + startPos);
return (PduContentTypes.contentTypes[0]).getBytes(); //"*/*"
}
pduDataStream.mark(1); pduDataStream.mark(1);
temp = pduDataStream.read(); temp = pduDataStream.read();
assert(-1 != temp); assert(-1 != temp);