JniObjectReferenceControlBlock.Alloc() takes JniObjectReference

We think this could be a potential race condition

Author: jonathanpeppers

src/Java.Interop/Java.Interop/JavaException.cs

@@ -138,10 +138,11 @@ protected void SetPeerReference (ref JniObjectReference reference, JniObjectRefe
 			var c   = jniObjectReferenceControlBlock;
 			if (c == null) {
 				c   = jniObjectReferenceControlBlock    =
-					Java.Interop.JniObjectReferenceControlBlock.Alloc ();
+					Java.Interop.JniObjectReferenceControlBlock.Alloc (reference);
+			} else {
+				c->handle       = reference.Handle;
+				c->handle_type  = (int) reference.Type;
 			}
-			c->handle       = reference.Handle;
-			c->handle_type  = (int) reference.Type;
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 
 			JniObjectReference.Dispose (ref reference, options);

src/Java.Interop/Java.Interop/JavaObject.cs

@@ -93,10 +93,11 @@ protected void SetPeerReference (ref JniObjectReference reference, JniObjectRefe
 			var c   = jniObjectReferenceControlBlock;
 			if (c == null) {
 				c   = jniObjectReferenceControlBlock    =
-					Java.Interop.JniObjectReferenceControlBlock.Alloc ();
+					Java.Interop.JniObjectReferenceControlBlock.Alloc (reference);
+			} else {
+				c->handle       = reference.Handle;
+				c->handle_type  = (int) reference.Type;
 			}
-			c->handle       = reference.Handle;
-			c->handle_type  = (int) reference.Type;
 #endif  // FEATURE_JNIOBJECTREFERENCE_INTPTRS
 
 			JniObjectReference.Dispose (ref reference, options);

src/Java.Interop/Java.Interop/JniObjectReferenceControlBlock.cs

@@ -11,9 +11,12 @@ internal struct JniObjectReferenceControlBlock {
 
 	public  static  readonly    int Size    = Marshal.SizeOf<JniObjectReferenceControlBlock>();
 
-	public static unsafe JniObjectReferenceControlBlock* Alloc ()
+	public static unsafe JniObjectReferenceControlBlock* Alloc (JniObjectReference reference)
 	{
-		return (JniObjectReferenceControlBlock*) NativeMemory.AllocZeroed (1, (uint) Size);
+		var value = (JniObjectReferenceControlBlock*) NativeMemory.AllocZeroed (1, (uint) Size);
+		value->handle       = reference.Handle;
+		value->handle_type  = (int) reference.Type;
+		return value;
 	}
 
 	public static unsafe void Free (ref JniObjectReferenceControlBlock* value)