From ad2d924b3490c01168ad1dfeb2fa05ebc61b8ef2 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 6 Mar 2020 14:52:28 -0800 Subject: [PATCH] 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 | 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 b55dc68af5589..491d4a61cee4c 100644 --- a/core/jni/android_content_res_ApkAssets.cpp +++ b/core/jni/android_content_res_ApkAssets.cpp @@ -85,6 +85,7 @@ 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, @@ -92,7 +93,7 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /*clazz*/, jobject file_descri 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; }