| commit | 46defd39b0356e832b1c79d0c2d8bced721e5e9f | [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:16:04 2019 -0800 |
| tree | de2ac526491b0f27877dec87061431ebe770ea2b | |
| parent | 6e267b38a8b110e7d6884f1983496a4d269c3bfd [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.cc b/src/nfc/tags/rw_i93.cc index eeafe10..a00a649 100644 --- a/src/nfc/tags/rw_i93.cc +++ b/src/nfc/tags/rw_i93.cc
@@ -2019,6 +2019,12 @@ DLOG_IF(INFO, nfc_debug_enabled) << __func__; + if (length == 0) { + android_errorWriteLog(0x534e4554, "122035770"); + rw_i93_handle_error(NFC_STATUS_FAILED); + return; + } + STREAM_TO_UINT8(flags, p); length--;