Direct byte buffer global reference added, fixes #434

koral-- · Aug 6, 2017 · f56916b · f56916b
1 parent 876b093
commit f56916b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/android-gif-drawable/src/main/c/dispose.c b/android-gif-drawable/src/main/c/dispose.c
@@ -22,19 +22,16 @@ Java_pl_droidsonroids_gif_GifInfoHandle_free(JNIEnv *env, jclass __unused handle
 		(*env)->DeleteGlobalRef(env, streamContainer->buffer);
 
 		free(streamContainer);
-	}
-	else if (info->rewindFunction == fileRewind) {
+	} else if (info->rewindFunction == fileRewind) {
 		fclose(info->gifFilePtr->UserData);
-	}
-	else if (info->rewindFunction == byteArrayRewind) {
-		ByteArrayContainer *bac = info->gifFilePtr->UserData;
-		if (bac->buffer != NULL) {
-			(*env)->DeleteGlobalRef(env, bac->buffer);
-		}
-		free(bac);
-	}
-	else if (info->rewindFunction == directByteBufferRewind) {
-		free(info->gifFilePtr->UserData);
+	} else if (info->rewindFunction == byteArrayRewind) {
+		ByteArrayContainer *container = info->gifFilePtr->UserData;
+		(*env)->DeleteGlobalRef(env, container->buffer);
+		free(container);
+	} else if (info->rewindFunction == directByteBufferRewind) {
+		DirectByteBufferContainer *container = info->gifFilePtr->UserData;
+		(*env)->DeleteGlobalRef(env, container->bufferRef);
+		free(container);
 	}
 	info->gifFilePtr->UserData = NULL;
 	cleanUp(info);

diff --git a/android-gif-drawable/src/main/c/gif.c b/android-gif-drawable/src/main/c/gif.c
@@ -203,6 +203,7 @@ Java_pl_droidsonroids_gif_GifInfoHandle_openDirectByteBuffer(JNIEnv *env, jclass
 		throwException(env, OUT_OF_MEMORY_ERROR, OOME_MESSAGE);
 		return NULL_GIF_INFO;
 	}
+	container->bufferRef = (*env)->NewGlobalRef(env, buffer);
 	container->bytes = bytes;
 	container->capacity = capacity;
 	container->position = 0;

diff --git a/android-gif-drawable/src/main/c/gif.h b/android-gif-drawable/src/main/c/gif.h
@@ -138,6 +138,7 @@ typedef struct {
 	jlong position;
 	jbyte *bytes;
 	jlong capacity;
+	jobject bufferRef;
 } DirectByteBufferContainer;
 
 typedef struct {