diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-24 23:36:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-25 01:44:33 -0700 |
| commit | 45d26c86b00580593067ca42091ad66cf7dc4f7c (patch) | |
| tree | b5fa7e7df42c1f7e7efb21b085980faac0e67937 /runtime/check_jni.cc | |
| parent | b5dc9444777bb027b070d3ff3fcf7a2a3fb7e3dc (diff) | |
| download | android_art-45d26c86b00580593067ca42091ad66cf7dc4f7c.tar.gz android_art-45d26c86b00580593067ca42091ad66cf7dc4f7c.tar.bz2 android_art-45d26c86b00580593067ca42091ad66cf7dc4f7c.zip | |
Treat larger than jint capacity in NewDirectByteBuffer as an error
Bug: 15854028
Change-Id: If78921f4ba2b38a9d0bb421acf9c8bca962ed42a
Diffstat (limited to 'runtime/check_jni.cc')
| -rw-r--r-- | runtime/check_jni.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc index a81648958b..fefb907422 100644 --- a/runtime/check_jni.cc +++ b/runtime/check_jni.cc @@ -1757,9 +1757,7 @@ PRIMITIVE_ARRAY_FUNCTIONS(jdouble, Double, 'D'); CHECK_JNI_ENTRY(kFlag_Default, "EpJ", env, address, capacity); if (address == nullptr) { JniAbortF(__FUNCTION__, "non-nullable address is NULL"); - } - if (capacity < 0) { - JniAbortF(__FUNCTION__, "capacity must be non-negative: %" PRId64, capacity); + return nullptr; } return CHECK_JNI_EXIT("L", baseEnv(env)->NewDirectByteBuffer(env, address, capacity)); } |