commit af2ee6fdc60888c860adf1bacaae078fe6018fc8
author Ivan Lozano <ivanlozano@google.com> Fri Dec 15 02:03:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 15 02:03:12 2017 +0000
tree 103eef9c210cc44b52004b017a9e2a63ee7a40e4
parent 8d2e819e45e5060134189e093506ca6422324a2f
parent 6b70634310d25ad6b9e6b6eadf3f5b9f3fa7a970

Fix nfcsnoop_cb on overflow sanitized builds. am: c3ec66ef5b am: 53309f9f87
am: 6b70634310

Change-Id: I6d376d29d8e0546b024482bc148a0fd7707b1184

src/adaptation/debug_nfcsnoop.cc

diff --git a/src/adaptation/debug_nfcsnoop.cc b/src/adaptation/debug_nfcsnoop.cc
index b58554e..9466b9f 100644
--- a/src/adaptation/debug_nfcsnoop.cc
+++ b/src/adaptation/debug_nfcsnoop.cc
@@ -60,8 +60,13 @@
   // Insert data
   header.length = length;
   header.is_received = is_received ? 1 : 0;
-  header.delta_time_ms =
-      last_timestamp_ms ? timestamp_us - last_timestamp_ms : 0;
+
+  uint64_t delta_time_ms = 0;
+  if (last_timestamp_ms) {
+    __builtin_sub_overflow(timestamp_us, last_timestamp_ms, &delta_time_ms);
+  }
+  header.delta_time_ms = delta_time_ms;
+
   last_timestamp_ms = timestamp_us;
 
   ringbuffer_insert(buffer, (uint8_t*)&header, sizeof(nfcsnooz_header_t));