commit 1e6f792eac7ed9c3b08abd2f7b345d8113552a48
author Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 07:25:59 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Jun 25 07:25:59 2009 -0700
tree 4bcfd0602946edf10e2e3d53e78e69eb62caf2fc
parent b69c0b3dba08507f760443dff03cc60511f70590
parent 7d8220a4d0193b85efd7d289cbff3617f56ef0a9

am 7d8220a4: Merge change 5286 into donut

Merge commit '7d8220a4d0193b85efd7d289cbff3617f56ef0a9'

* commit '7d8220a4d0193b85efd7d289cbff3617f56ef0a9':
  Check for failure in GetDirectBufferAddress.

vm/Jni.c

diff --git a/vm/Jni.c b/vm/Jni.c
index 10b017c..831a349 100644
--- a/vm/Jni.c
+++ b/vm/Jni.c
@@ -2768,6 +2768,10 @@
     jmethodID toLongMethod;
     void* result = NULL;
 
+    /*
+     * Start by determining if the object supports the DirectBuffer
+     * interfaces.  Note this does not guarantee that it's a direct buffer.
+     */
     tempClass = (*env)->FindClass(env, 
             "org/apache/harmony/nio/internal/DirectBuffer");
     if(!tempClass)
@@ -2786,6 +2790,20 @@
         goto bail;
     }
     platformAddr = (*env)->CallObjectMethod(env, buf, tempMethod);
+
+    /*
+     * If this isn't a direct buffer, platformAddr will be NULL and/or an
+     * exception will have been thrown.
+     */
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionClear(env);
+        platformAddr = NULL;
+    }
+    if (platformAddr == NULL) {
+        LOGV("Got request for address of non-direct buffer\n");
+        goto bail;
+    }
+
     platformAddrClass = (*env)->FindClass (env, 
             "org/apache/harmony/luni/platform/PlatformAddress");
     if(!platformAddrClass)