From df1eb3f8c88fb12077e0d45b1de4c41b006f1ea9 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Mon, 9 Mar 2020 10:42:18 -0700 Subject: [PATCH] Fix bugprone-use-after-move warnings Bug: 150783499 Test: WITH_TIDY=1 make Merged-In: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c Change-Id: I745d8bfde00a77bcdbbeaa21cfe81af1c74a971c (cherry picked from commit 1982fb5726dfe208c6693b0b89b2716bd39332e6) --- core/jni/android_content_res_ApkAssets.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/jni/android_content_res_ApkAssets.cpp b/core/jni/android_content_res_ApkAssets.cpp index bd4862dfb08de..d4369d40a45ea 100644 --- a/core/jni/android_content_res_ApkAssets.cpp +++ b/core/jni/android_content_res_ApkAssets.cpp @@ -78,12 +78,13 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /*clazz*/, jobject file_descri return 0; } + auto dup_fd_id = dup_fd.get(); std::unique_ptr apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd), friendly_name_utf8.c_str(), system, force_shared_lib); 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; }