commit 0e54afac4dbd6ff2b2f9003c918b25040e349b1d
author Ruchi Kandoi <kandoiruchi@google.com> Thu Nov 15 14:31:42 2018 -0800
committer JP Sugarbroad <jpsugar@google.com> Mon Jan 14 16:23:29 2019 -0800
tree 10a68bee130a92a899d96480ec719cffaa3eaa3a
parent 6c91f0b56beeeee5160727e0f9280813976a93c4

Fix CVEs in llcp_util.cc

Test: Nfc enable/disable
Bug: 119223615
Merged-In: Ie1e7f3285e2fcf88382b2be8bb09e1f9fb98be03
Merged-In: Ie28888ddb9a5a2605ae32a27e3dba01c35ab3913
Change-Id: I2f4fb85737accbab9bb9ff973353a03097f6ee46
(cherry picked from commit 10c2177816f0fd55e81ed9a2aa610c1e9ef516dc)

src/nfc/llcp/llcp_util.c

diff --git a/src/nfc/llcp/llcp_util.c b/src/nfc/llcp/llcp_util.c
index 3b984e3..712eabb 100644
--- a/src/nfc/llcp/llcp_util.c
+++ b/src/nfc/llcp/llcp_util.c
@@ -112,7 +112,6 @@
       default:
         LLCP_TRACE_ERROR1(
             "llcp_util_parse_link_params (): Unexpected type 0x%x", param_type);
-        BE_STREAM_TO_UINT8(param_len, p);
         p += param_len;
         break;
     }
@@ -545,7 +544,6 @@
       default:
         LLCP_TRACE_ERROR1("llcp_util_parse_connect (): Unexpected type 0x%x",
                           param_type);
-        BE_STREAM_TO_UINT8(param_len, p);
         p += param_len;
         break;
     }
@@ -664,7 +662,6 @@
       default:
         LLCP_TRACE_ERROR1("llcp_util_parse_cc (): Unexpected type 0x%x",
                           param_type);
-        BE_STREAM_TO_UINT8(param_len, p);
         p += param_len;
         break;
     }