Use Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.

This fixes all instances in the networking code, but doesn't address similar
patterns, nor non-networking code. This seemed like a reasonably-sized
meaningful chunk. Tested on sapphire-eng.

Bug: 1639287

2 files changed, 8 insertions, 14 deletions

diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl.cpp b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl.cpp
index feae690..c79bfdf 100644
--- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl.cpp
+++ b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl.cpp
@@ -150,20 +150,15 @@ static jint org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl_deserialize
  */
 static jbyteArray org_apache_harmony_xnet_provider_jsse_OpenSSLSessionImpl_getid(JNIEnv* env, jobject object)
 {
-    SSL_SESSION * ssl_session;
-    jbyteArray bytes;
-    jbyte *tmp;
-
-    ssl_session = getSslSessionPointer(env, object);
+    SSL_SESSION* ssl_session = getSslSessionPointer(env, object);
 
-    bytes = env->NewByteArray(ssl_session->session_id_length);
-    if (bytes != NULL) {
-        tmp = env->GetByteArrayElements(bytes, NULL);
-        memcpy(tmp, ssl_session->session_id, ssl_session->session_id_length);
-        env->ReleaseByteArrayElements(bytes, tmp, 0);
+    jbyteArray result = env->NewByteArray(ssl_session->session_id_length);
+    if (result != NULL) {
+        jbyte* src = reinterpret_cast<jbyte*>(ssl_session->session_id);
+        env->SetByteArrayRegion(result, 0, ssl_session->session_id_length, src);
     }
 
-    return bytes;
+    return result;
 }
 
 /**
diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_common.h b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_common.h
index 9ed75be..409b4ec 100644
--- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_common.h
+++ b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_common.h
@@ -76,9 +76,8 @@ static jobjectArray getcertificatebytes(JNIEnv* env,
                 joa = NULL;
                 break;
             } else {
-                jbyte *tmp = env->GetByteArrayElements(bytes, NULL);
-                memcpy(tmp, bptr->data, bptr->length);
-                env->ReleaseByteArrayElements(bytes, tmp, 0);
+                jbyte* src = reinterpret_cast<jbyte*>(bptr->data);
+                env->SetByteArrayRegion(bytes, 0, bptr->length, src);
                 env->SetObjectArrayElement(joa, i, bytes);
             }
         }