commit ba79c9d03f2ee34373ad377c5b72ea6b28783dc9
author Raj Mojumder <rmojumder@google.com> Wed May 08 15:11:00 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 10 00:34:26 2019 +0000
tree 27fdff702a1eb316e5f3ca1c5f2f47ae927c7874
parent 9e2e19b4f3280be80ab83e9f54601be86611ddca

Revert "Fix integer overflow in NDEF_MsgValidate."

This reverts commit a5db70f3c684767ec5160cea79743e9420b65f5d.

BUG: 132227011
Merged-In: Iaed90d46f77e20091fd868ddd89567c471e58b6a
Change-Id: I0b67ee1436263c8997c20212d9a08fc96b113c9c
Signed-off-by: Raj Mojumder <rmojumder@google.com>
(cherry picked from commit 6edef8e4c4b108f8deb5856d885ba9da504c2e9c)

src/nfc/ndef/ndef_utils.cc

diff --git a/src/nfc/ndef/ndef_utils.cc b/src/nfc/ndef/ndef_utils.cc
index e236e75..fa2c007 100644
--- a/src/nfc/ndef/ndef_utils.cc
+++ b/src/nfc/ndef/ndef_utils.cc
@@ -23,8 +23,6 @@
  *
  ******************************************************************************/
 #include "ndef_utils.h"
-#include <log/log.h>
-#include <stddef.h>
 #include <string.h>
 
 /*******************************************************************************
@@ -197,13 +195,6 @@
       }
     }
 
-    /* Check for integer overflow */
-    if (((uint8_t*)(~0U) - p_rec) <
-        (ptrdiff_t)(payload_len + type_len + id_len)) {
-      android_errorWriteLog(0x534e4554, "126200054");
-      return (NDEF_MSG_LENGTH_MISMATCH);
-    }
-
     /* Point to next record */
     p_rec += (payload_len + type_len + id_len);