commit 8fcaca53648e72bfc08b2316d42d844dfd2cef41
author Ian Rogers <irogers@google.com> Wed Aug 21 16:55:13 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 21 22:40:46 2013 -0700
tree d4f77b11f23ab81958a9eab22af855a59b3b5b25
parent 379e2f5996b38d9f67b9c334c232cb315a5390ad

Allow NULL JNI arguments for length 0 memcpys.

Bug 10393546.

(cherry picked from commit 4ffdc6bd962c37bca407267c0858b37bb18a9857)

Change-Id: I02058019be16c07da06cb88654556aac1d7964a8

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 55c0765..714bc30 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -611,6 +611,11 @@
     JniAbortF(#fn, #value " == null"); \
   }
 
+#define CHECK_NON_NULL_MEMCPY_ARGUMENT(fn, length, value) \
+  if (UNLIKELY(length != 0 && value == NULL)) { \
+    JniAbortF(#fn, #value " == null"); \
+  }
+
 class JNI {
  public:
   static jint GetVersion(JNIEnv*) {
@@ -1968,7 +1973,7 @@
     if (start < 0 || length < 0 || start + length > s->GetLength()) {
       ThrowSIOOBE(soa, start, length, s->GetLength());
     } else {
-      CHECK_NON_NULL_ARGUMENT(GetStringRegion, buf);
+      CHECK_NON_NULL_MEMCPY_ARGUMENT(GetStringRegion, length, buf);
       const jchar* chars = s->GetCharArray()->GetData() + s->GetOffset();
       memcpy(buf, chars + start, length * sizeof(jchar));
     }
@@ -1982,7 +1987,7 @@
     if (start < 0 || length < 0 || start + length > s->GetLength()) {
       ThrowSIOOBE(soa, start, length, s->GetLength());
     } else {
-      CHECK_NON_NULL_ARGUMENT(GetStringUTFRegion, buf);
+      CHECK_NON_NULL_MEMCPY_ARGUMENT(GetStringUTFRegion, length, buf);
       const jchar* chars = s->GetCharArray()->GetData() + s->GetOffset();
       ConvertUtf16ToModifiedUtf8(buf, chars + start, length);
     }
@@ -2566,7 +2571,7 @@
     if (start < 0 || length < 0 || start + length > array->GetLength()) {
       ThrowAIOOBE(soa, array, start, length, "src");
     } else {
-      CHECK_NON_NULL_ARGUMENT(GetPrimitiveArrayRegion, buf);
+      CHECK_NON_NULL_MEMCPY_ARGUMENT(GetStringRegion, length, buf);
       JavaT* data = array->GetData();
       memcpy(buf, data + start, length * sizeof(JavaT));
     }
@@ -2581,7 +2586,7 @@
     if (start < 0 || length < 0 || start + length > array->GetLength()) {
       ThrowAIOOBE(soa, array, start, length, "dst");
     } else {
-      CHECK_NON_NULL_ARGUMENT(SetPrimitiveArrayRegion, buf);
+      CHECK_NON_NULL_MEMCPY_ARGUMENT(GetStringRegion, length, buf);
       JavaT* data = array->GetData();
       memcpy(data + start, buf, length * sizeof(JavaT));
     }