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

Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614

Browse Source 
am: 40c14a83d0

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
This commit is contained in:
Ruchi Kandoi
2017-01-25 20:07:23 +00:00
committed by android-build-merger
parent c39388d605 40c14a83d0
commit deac669a53
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/nfc/NdefRecord.java
View File

@@ -805,7 +805,7 @@ public final class NdefRecord implements Parcelable {
if (!mb && records.size() == 0 && !inChunk && !ignoreMbMe) { if (!mb && records.size() == 0 && !inChunk && !ignoreMbMe) {
throw new FormatException("expected MB flag"); throw new FormatException("expected MB flag");
} else if (mb && records.size() != 0 && !ignoreMbMe) { } else if (mb && (records.size() != 0 || inChunk) && !ignoreMbMe) {
throw new FormatException("unexpected MB flag"); throw new FormatException("unexpected MB flag");
} else if (inChunk && il) { } else if (inChunk && il) {
throw new FormatException("unexpected IL flag in non-leading chunk"); throw new FormatException("unexpected IL flag in non-leading chunk");
@@ -839,6 +839,9 @@ public final class NdefRecord implements Parcelable {
if (cf && !inChunk) { if (cf && !inChunk) {
// first chunk // first chunk
if (typeLength == 0) {
throw new FormatException("expected non-zero type length in first chunk");
}
chunks.clear(); chunks.clear();
chunkTnf = tnf; chunkTnf = tnf;
} }