1 files changed, 28 insertions, 7 deletions
diff --git a/src/java/native/com_libmailcore_Attachment.cpp b/src/java/native/com_libmailcore_Attachment.cpp
index 652a3337..ddcd0f57 100644
--- a/src/java/native/com_libmailcore_Attachment.cpp
+++ b/src/java/native/com_libmailcore_Attachment.cpp
@@ -13,37 +13,55 @@ using namespace mailcore;
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Attachment_mimeTypeForFilename
   (JNIEnv * env, jclass javaClass, jstring filename)
 {
-    return (jstring) MC_TO_JAVA(Attachment::mimeTypeForFilename(MC_FROM_JAVA(String, filename)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::mimeTypeForFilename(MC_FROM_JAVA(String, filename)));
+    MC_POOL_END;
+    return (jstring) result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Attachment_attachmentWithContentsOfFile
   (JNIEnv * env, jclass javaClass, jstring filename)
 {
-    return MC_TO_JAVA(Attachment::attachmentWithContentsOfFile(MC_FROM_JAVA(String, filename)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::attachmentWithContentsOfFile(MC_FROM_JAVA(String, filename)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Attachment_attachmentWithData
   (JNIEnv * env, jclass javaClass, jstring filename, jbyteArray data)
 {
-    return MC_TO_JAVA(Attachment::attachmentWithData(MC_FROM_JAVA(String, filename), MC_FROM_JAVA(Data, data)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::attachmentWithData(MC_FROM_JAVA(String, filename), MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Attachment_attachmentWithHTMLString
   (JNIEnv * env, jclass javaClass, jstring htmlString)
 {
-    return MC_TO_JAVA(Attachment::attachmentWithHTMLString(MC_FROM_JAVA(String, htmlString)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::attachmentWithHTMLString(MC_FROM_JAVA(String, htmlString)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Attachment_attachmentWithRFC822Message
   (JNIEnv * env, jclass javaClass, jbyteArray data)
 {
-    return MC_TO_JAVA(Attachment::attachmentWithRFC822Message(MC_FROM_JAVA(Data, data)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::attachmentWithRFC822Message(MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Attachment_attachmentWithText
   (JNIEnv * env, jclass javaClass, jstring text)
 {
-    return MC_TO_JAVA(Attachment::attachmentWithText(MC_FROM_JAVA(String, text)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Attachment::attachmentWithText(MC_FROM_JAVA(String, text)));
+    MC_POOL_END;
+    return result;
 }
 
 MC_JAVA_SYNTHESIZE_DATA(setData, data)
@@ -51,7 +69,10 @@ MC_JAVA_SYNTHESIZE_DATA(setData, data)
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Attachment_decodedString
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET_STRING(decodedString);
+    MC_POOL_BEGIN;
+    jstring result = MC_JAVA_BRIDGE_GET_STRING(decodedString);
+    MC_POOL_END;
+    return result;
 }
 
 MC_JAVA_BRIDGE