commit 017838585617f0e492ede866750fcfb8ed77830b
author Jack Yu <jackcwyu@google.com> Wed Sep 18 21:19:20 2019 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 11 02:35:14 2019 +0000
tree 9d8017de7b84c9d5b3682f6140ac9ea706ccb1cd
parent b6f856f7a4840b5948695d2249bfae5a7088fe24

Fix stack-use-after-scope in NativeNfcManager.cpp

Bug: 141170038
Test: Nfc Enable/Disable with NFC SIM
Change-Id: I938af468869f41824f0af447f56a879afe77b52e
(cherry picked from commit 3c2a9251620ed8b7cb4045b8134df2accc641601)

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 92e07ff..65f006f 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -891,11 +891,12 @@
   if (aid == NULL) {
     buf = NULL;
     bufLen = 0;
-  } else {
-    ScopedByteArrayRO bytes(e, aid);
-    buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
-    bufLen = bytes.size();
+    return RoutingManager::getInstance().addAidRouting(buf, bufLen, route,
+                                                       aidInfo);
   }
+  ScopedByteArrayRO bytes(e, aid);
+  buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
+  bufLen = bytes.size();
   return RoutingManager::getInstance().addAidRouting(buf, bufLen, route,
                                                      aidInfo);
 }
@@ -918,13 +919,12 @@
   if (aid == NULL) {
     buf = NULL;
     bufLen = 0;
-  } else {
-    ScopedByteArrayRO bytes(e, aid);
-    buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
-    bufLen = bytes.size();
+    return RoutingManager::getInstance().removeAidRouting(buf, bufLen);
   }
-  bool result = RoutingManager::getInstance().removeAidRouting(buf, bufLen);
-  return result;
+  ScopedByteArrayRO bytes(e, aid);
+  buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
+  bufLen = bytes.size();
+  return RoutingManager::getInstance().removeAidRouting(buf, bufLen);
 }
 
 /*******************************************************************************