From a3d41171177d961b8b86916704ebbc581ab62ca1 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Tue, 8 Jul 2014 09:39:50 -0700
Subject: [PATCH] Close body input streams

b/16153171

Change-Id: Iab1224957d1079969be51d2843df5250c8660b8a
---
 .../android/email/provider/EmailMessageCursor.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/com/android/email/provider/EmailMessageCursor.java b/src/com/android/email/provider/EmailMessageCursor.java
index e4aa27003..d57fb1e34 100644
--- a/src/com/android/email/provider/EmailMessageCursor.java
+++ b/src/com/android/email/provider/EmailMessageCursor.java
@@ -70,7 +70,12 @@ public class EmailMessageCursor extends CursorWrapper {
                 if (mHtmlColumnIndex != -1) {
                     final Uri htmlUri = Body.getBodyHtmlUriForMessageWithId(messageId);
                     final InputStream in = cr.openInputStream(htmlUri);
-                    final String underlyingHtmlString = IOUtils.toString(in);
+                    final String underlyingHtmlString;
+                    try {
+                        underlyingHtmlString = IOUtils.toString(in);
+                    } finally {
+                        in.close();
+                    }
                     final String sanitizedHtml = HtmlSanitizer.sanitizeHtml(underlyingHtmlString);
                     mHtmlParts.put(position, sanitizedHtml);
                 }
@@ -81,7 +86,12 @@ public class EmailMessageCursor extends CursorWrapper {
                 if (mTextColumnIndex != -1) {
                     final Uri textUri = Body.getBodyTextUriForMessageWithId(messageId);
                     final InputStream in = cr.openInputStream(textUri);
-                    final String underlyingTextString = IOUtils.toString(in);
+                    final String underlyingTextString;
+                    try {
+                        underlyingTextString = IOUtils.toString(in);
+                    } finally {
+                        in.close();
+                    }
                     mTextParts.put(position, underlyingTextString);
                 }
             } catch (final IOException e) {