commit 15b4aab826bdd4360ec720dfd8bd514be0752f13
author Orion Hodson <oth@google.com> Sun Jun 07 19:09:37 2020 +0100
committer Orion Hodson <oth@google.com> Mon Jun 08 07:38:03 2020 +0100
tree 8b1f863b25210116de7292fa2a5b10b5dedebd23
parent 6a1c3272588bac347261d83ebc49904f765a5e3c

Delete local reference in toStringArray() error paths

Bug: 151443957
Test: Treehugger
Change-Id: I3b6324c92ef80be085f1d31abf84299d6e6eb228

include/nativehelper/toStringArray.h

diff --git a/include/nativehelper/toStringArray.h b/include/nativehelper/toStringArray.h
index 8d25974..0ff45ec 100644
--- a/include/nativehelper/toStringArray.h
+++ b/include/nativehelper/toStringArray.h
@@ -26,7 +26,8 @@
 
 template <typename StringVisitor>
 jobjectArray toStringArray(JNIEnv* env, size_t count, StringVisitor&& visitor) {
-    jobjectArray result = jniCreateStringArray(static_cast<C_JNIEnv*>(&env->functions), count);
+    C_JNIEnv* c_env = static_cast<C_JNIEnv*>(&env->functions);
+    ScopedLocalRef<jobjectArray> result(env, jniCreateStringArray(c_env, count));
     if (result == nullptr) {
         return nullptr;
     }
@@ -35,12 +36,12 @@
         if (env->ExceptionCheck()) {
             return nullptr;
         }
-        env->SetObjectArrayElement(result, i, s.get());
+        env->SetObjectArrayElement(result.get(), i, s.get());
         if (env->ExceptionCheck()) {
             return nullptr;
         }
     }
-    return result;
+    return result.release();
 }
 
 inline jobjectArray toStringArray(JNIEnv* env, const std::vector<std::string>& strings) {