| commit | 46f44fd65397d1dc26cb70820ca5eb6f081216a0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Feb 01 23:41:13 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 01 23:41:13 2019 +0000 |
| tree | 1242c7aad828cbb9b8e6bfa8044eb8420cb8fc84 | |
| parent | 8617cbb1a8c2f08de97b6d4c48c053781c67a926 [diff] | |
| parent | 61fcf8972501f9897e9e6e0bc37c60e908421e9a [diff] |
Merge "Prevent OOB error in rw_i93_sm_read_ndef()" into oc-dev
diff --git a/src/nfc/tags/rw_i93.c b/src/nfc/tags/rw_i93.c index ff3e61d..a62aacd 100644 --- a/src/nfc/tags/rw_i93.c +++ b/src/nfc/tags/rw_i93.c
@@ -1776,6 +1776,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--;