Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: base/android/apk_assets.cc

Issue 1272203002: Fix local reference leak in OpenApkAsset. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <jni.h> 5 #include <jni.h>
6 6
7 #include "base/android/apk_assets.h" 7 #include "base/android/apk_assets.h"
8 8
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "jni/ApkAssets_jni.h" 12 #include "jni/ApkAssets_jni.h"
13 13
14 namespace base { 14 namespace base {
15 namespace android { 15 namespace android {
16 16
17 bool RegisterApkAssets(JNIEnv* env) { 17 bool RegisterApkAssets(JNIEnv* env) {
18 return RegisterNativesImpl(env); 18 return RegisterNativesImpl(env);
19 } 19 }
20 20
21 int OpenApkAsset(const std::string& file_path, 21 int OpenApkAsset(const std::string& file_path,
22 base::MemoryMappedFile::Region* region) { 22 base::MemoryMappedFile::Region* region) {
23 // The AAssetManager API of the NDK is does not expose a method for accessing 23 // The AAssetManager API of the NDK is does not expose a method for accessing
24 // raw resources :(. 24 // raw resources :(.
25 JNIEnv* env = base::android::AttachCurrentThread(); 25 JNIEnv* env = base::android::AttachCurrentThread();
26 ScopedJavaLocalRef<jlongArray> jarr = Java_ApkAssets_open( 26 ScopedJavaLocalRef<jlongArray> jarr = Java_ApkAssets_open(
27 env, 27 env,
28 base::android::GetApplicationContext(), 28 base::android::GetApplicationContext(),
29 base::android::ConvertUTF8ToJavaString(env, file_path).Release()); 29 base::android::ConvertUTF8ToJavaString(env, file_path).obj());
30 std::vector<jlong> results; 30 std::vector<jlong> results;
31 base::android::JavaLongArrayToLongVector(env, jarr.obj(), &results); 31 base::android::JavaLongArrayToLongVector(env, jarr.obj(), &results);
32 CHECK_EQ(3U, results.size()); 32 CHECK_EQ(3U, results.size());
33 int fd = static_cast<int>(results[0]); 33 int fd = static_cast<int>(results[0]);
34 region->offset = results[1]; 34 region->offset = results[1];
35 region->size = results[2]; 35 region->size = results[2];
36 return fd; 36 return fd;
37 } 37 }
38 38
39 bool RegisterApkAssetWithGlobalDescriptors(base::GlobalDescriptors::Key key, 39 bool RegisterApkAssetWithGlobalDescriptors(base::GlobalDescriptors::Key key,
40 const std::string& file_path) { 40 const std::string& file_path) {
41 base::MemoryMappedFile::Region region = 41 base::MemoryMappedFile::Region region =
42 base::MemoryMappedFile::Region::kWholeFile; 42 base::MemoryMappedFile::Region::kWholeFile;
43 int asset_fd = OpenApkAsset(file_path, &region); 43 int asset_fd = OpenApkAsset(file_path, &region);
44 if (asset_fd != -1) { 44 if (asset_fd != -1) {
45 base::GlobalDescriptors::GetInstance()->Set(key, asset_fd, region); 45 base::GlobalDescriptors::GetInstance()->Set(key, asset_fd, region);
46 } 46 }
47 return asset_fd != -1; 47 return asset_fd != -1;
48 } 48 }
49 49
50 } // namespace android 50 } // namespace android
51 } // namespace base 51 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698