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

2021-05-14 16:32:33 +00:00
parent 1b0e20108d 0445be53de
commit 54b18bd8e8
1 changed files with 5 additions and 0 deletions
--- a/telephony/common/com/google/android/mms/pdu/PduParser.java
+++ b/telephony/common/com/google/android/mms/pdu/PduParser.java
@@ -1550,6 +1550,11 @@ public class PduParser {
        if (cur < TEXT_MIN) {
            int length = parseValueLength(pduDataStream);
            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);
            temp = pduDataStream.read();
            assert(-1 != temp);