BJA-563 explicitly closed off some input streams.

dghgit · dghgit · commit 8da6f13f380c · 2015-09-17T07:39:33.000+10:00
diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEUtil.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEUtil.java
@@ -390,6 +390,8 @@ static void outputBodyPart(
                 outCRLF.write(buf, 0, len);
             }
 
+            inRaw.close();
+
             outCRLF.flush();
         }
         else
diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/handlers/PKCS7ContentHandler.java b/mail/src/main/java/org/bouncycastle/mail/smime/handlers/PKCS7ContentHandler.java
@@ -90,6 +90,8 @@ else if (obj instanceof InputStream)
             {
                 os.write(b);
             }
+
+            in.close();
         }
         else if (obj instanceof SMIMEStreamingProcessor)
         {
diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/handlers/multipart_signed.java b/mail/src/main/java/org/bouncycastle/mail/smime/handlers/multipart_signed.java
@@ -1,6 +1,12 @@
 package org.bouncycastle.mail.smime.handlers;
 
-import org.bouncycastle.mail.smime.SMIMEStreamingProcessor;
+import java.awt.datatransfer.DataFlavor;
+import java.io.BufferedInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Enumeration;
 
 import javax.activation.ActivationDataFlavor;
 import javax.activation.DataContentHandler;
@@ -10,13 +16,8 @@
 import javax.mail.internet.ContentType;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMultipart;
-import java.awt.datatransfer.DataFlavor;
-import java.io.BufferedInputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
+
+import org.bouncycastle.mail.smime.SMIMEStreamingProcessor;
 
 public class multipart_signed 
     implements DataContentHandler 
@@ -88,6 +89,8 @@ else if (obj instanceof InputStream)
             {
                 os.write(b);
             }
+
+            in.close();
         }
         else if (obj instanceof SMIMEStreamingProcessor)
         {

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,8 @@ static void outputBodyPart(`
`390`	`390`	`outCRLF.write(buf, 0, len);`
`391`	`391`	`}`
`392`	`392`
	`393`	`+ inRaw.close();`
	`394`	`+`
`393`	`395`	`outCRLF.flush();`
`394`	`396`	`}`
`395`	`397`	`else`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ else if (obj instanceof InputStream)`
`90`	`90`	`{`
`91`	`91`	`os.write(b);`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+ in.close();`
`93`	`95`	`}`
`94`	`96`	`else if (obj instanceof SMIMEStreamingProcessor)`
`95`	`97`	`{`