commit c50358b8947ae4367132dae5987d2e9738e90464
author Christopher Ferris <cferris@google.com> Fri Apr 17 13:26:09 2015 -0700
committer Christopher Ferris <cferris@google.com> Fri Apr 17 14:16:33 2015 -0700
tree 5decdfc2d16a72565bd2c1ca4f497f37fe081bcb
parent b73f887f7e9a6794159d8ae646e9b1d18797125c

Fix access past end of args array.

Bug: 20340831
Change-Id: Ibc0995e28e74c65d81f001e5b4d1e4780ff19686

runtime/check_jni.cc

diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc
index f94ebea..c6940d3 100644
--- a/runtime/check_jni.cc
+++ b/runtime/check_jni.cc
@@ -742,7 +742,6 @@
 
   bool CheckNonHeapValue(char fmt, JniValueType arg) {
     switch (fmt) {
-      case '.':  // ...
       case 'p':  // TODO: pointer - null or readable?
       case 'v':  // JavaVM*
       case 'B':  // jbyte
@@ -937,9 +936,6 @@
             break;
         }
         break;
-      case '.':
-        *msg += "...";
-        break;
       default:
         LOG(FATAL) << function_name_ << ": unknown trace format specifier: '" << fmt << "'";
     }
@@ -1635,7 +1631,7 @@
   static jint ThrowNew(JNIEnv* env, jclass c, const char* message) {
     ScopedObjectAccess soa(env);
     ScopedCheck sc(kFlag_NullableUtf, __FUNCTION__);
-    JniValueType args[5] = {{.E = env}, {.c = c}, {.u = message}};
+    JniValueType args[3] = {{.E = env}, {.c = c}, {.u = message}};
     if (sc.Check(soa, true, "Ecu", args) && sc.CheckThrowableClass(soa, c)) {
       JniValueType result;
       result.i = baseEnv(env)->ThrowNew(env, c, message);
@@ -1811,7 +1807,7 @@
     ScopedObjectAccess soa(env);
     ScopedCheck sc(kFlag_Default, __FUNCTION__);
     JniValueType args[3] = {{.E = env}, {.c = c}, {.m = mid}};
-    if (sc.Check(soa, true, "Ecm.", args) && sc.CheckInstantiableNonArray(soa, c) &&
+    if (sc.Check(soa, true, "Ecm", args) && sc.CheckInstantiableNonArray(soa, c) &&
         sc.CheckConstructor(soa, mid)) {
       JniValueType result;
       result.L = baseEnv(env)->NewObjectV(env, c, mid, vargs);
@@ -1834,7 +1830,7 @@
     ScopedObjectAccess soa(env);
     ScopedCheck sc(kFlag_Default, __FUNCTION__);
     JniValueType args[3] = {{.E = env}, {.c = c}, {.m = mid}};
-    if (sc.Check(soa, true, "Ecm.", args) && sc.CheckInstantiableNonArray(soa, c) &&
+    if (sc.Check(soa, true, "Ecm", args) && sc.CheckInstantiableNonArray(soa, c) &&
         sc.CheckConstructor(soa, mid)) {
       JniValueType result;
       result.L = baseEnv(env)->NewObjectA(env, c, mid, vargs);
@@ -2669,18 +2665,18 @@
       case kVirtual: {
         DCHECK(c == nullptr);
         JniValueType args[3] = {{.E = env}, {.L = obj}, {.m = mid}};
-        checked = sc.Check(soa, true, "ELm.", args);
+        checked = sc.Check(soa, true, "ELm", args);
         break;
       }
       case kDirect: {
         JniValueType args[4] = {{.E = env}, {.L = obj}, {.c = c}, {.m = mid}};
-        checked = sc.Check(soa, true, "ELcm.", args);
+        checked = sc.Check(soa, true, "ELcm", args);
         break;
       }
       case kStatic: {
         DCHECK(obj == nullptr);
         JniValueType args[3] = {{.E = env}, {.c = c}, {.m = mid}};
-        checked = sc.Check(soa, true, "Ecm.", args);
+        checked = sc.Check(soa, true, "Ecm", args);
         break;
       }
       default: