Undecoded jobject leaking in through attachThread

picked from
https://android-review.googlesource.com/#/c/23058/

1 files changed, 3 insertions, 1 deletions

diff --git a/vm/Jni.c b/vm/Jni.c
index 8f1df3390..6744d9cc6 100644
--- a/vm/Jni.c
+++ b/vm/Jni.c
@@ -566,6 +566,8 @@ static inline ReferenceTable* getLocalRefTable(JNIEnv* env)
  * reference may be local, global, or weak-global.
  *
  * If "jobj" is NULL or an invalid indirect reference, this returns NULL.
+ *
+ * Note "env" may be NULL when decoding global references.
  */
 Object* dvmDecodeIndirectRef(JNIEnv* env, jobject jobj)
 {
@@ -3856,7 +3858,7 @@ static jint attachThread(JavaVM* vm, JNIEnv** p_env, void* thr_args,
         argsCopy.version = args->version;
         argsCopy.name = args->name;
         if (args->group != NULL)
-            argsCopy.group = args->group;
+            argsCopy.group = dvmDecodeIndirectRef(NULL, args->group);
         else
             argsCopy.group = dvmGetMainThreadGroup();
     }