| commit | 8005b2fa47b8cd4c3bd839a20184d210e5a6586d | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Wed Jan 30 14:59:09 2019 +0800 |
| committer | JP Sugarbroad <jpsugar@google.com> | Tue Feb 12 13:11:52 2019 -0800 |
| tree | da252c3f6b7f1625b6c88d43aa0672b5ed503616 | |
| parent | 1e4a4c4a4709f60764b3aff3a0048a52fe6ae0ef [diff] |
Prevent OOB error in rw_i93_sm_read_ndef() Bug: 122035770 Test: NFC tag reading Change-Id: Ic006676962578871ad7ce20064226b096aad662f Merged-In: I053e9f01dc921bab55b5781c83f048d2638d5b87 (cherry picked from commit 61fcf8972501f9897e9e6e0bc37c60e908421e9a)
diff --git a/src/nfc/tags/rw_i93.c b/src/nfc/tags/rw_i93.c index 2a7a307..5120362 100644 --- a/src/nfc/tags/rw_i93.c +++ b/src/nfc/tags/rw_i93.c
@@ -1803,6 +1803,12 @@ RW_TRACE_DEBUG0("rw_i93_sm_read_ndef ()"); + if (length == 0) { + android_errorWriteLog(0x534e4554, "122035770"); + rw_i93_handle_error(NFC_STATUS_FAILED); + return; + } + STREAM_TO_UINT8(flags, p); length--;