commit ad2d924b3490c01168ad1dfeb2fa05ebc61b8ef2
author Chih-Hung Hsieh <chh@google.com> Fri Mar 06 14:52:28 2020 -0800
committer Ryan Mitchell <rtmitchell@google.com> Thu Mar 19 18:33:37 2020 -0700
tree 0b935788fa3c08cbf624e54c69850d41beac9075
parent e35e87f51453849f78a3be41a25e1257820eda5a

Fix bugprone-use-after-move warnings

Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c
Merged-In: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c

core/jni/android_content_res_ApkAssets.cpp

diff --git a/core/jni/android_content_res_ApkAssets.cpp b/core/jni/android_content_res_ApkAssets.cpp
index b55dc68..491d4a6 100644
--- a/core/jni/android_content_res_ApkAssets.cpp
+++ b/core/jni/android_content_res_ApkAssets.cpp
@@ -85,6 +85,7 @@
     return 0;
   }
 
+  auto dup_fd_id = dup_fd.get();
   std::unique_ptr<const ApkAssets> apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd),
                                                                       friendly_name_utf8.c_str(),
                                                                       system, force_shared_lib,
@@ -92,7 +93,7 @@
 
   if (apk_assets == nullptr) {
     std::string error_msg = base::StringPrintf("Failed to load asset path %s from fd %d",
-                                               friendly_name_utf8.c_str(), dup_fd.get());
+                                               friendly_name_utf8.c_str(), dup_fd_id);
     jniThrowException(env, "java/io/IOException", error_msg.c_str());
     return 0;
   }