Fix potential missed stream close when decrypting streams

unverbraucht · Jan 18, 2020 · 012c3f9 · 012c3f9
1 parent 7485989
commit 012c3f9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...me/neuhalfen/projects/crypto/bouncycastle/openpgp/decrypting/DecryptionStreamFactory.java b/...me/neuhalfen/projects/crypto/bouncycastle/openpgp/decrypting/DecryptionStreamFactory.java
@@ -155,12 +155,16 @@ private InputStream nextDecryptedStream(PGPObjectFactory factory,
 
         // decrypt the data
 
-        final InputStream plainText = pbe
+        try(
+                InputStream plainText = pbe
             .getDataStream(new BcPublicKeyDataDecryptorFactory(
-                privateKey)); // NOPMD: AvoidInstantiatingObjectsInLoops
-        final PGPObjectFactory nextFactory = new PGPObjectFactory(plainText,
-            new BcKeyFingerprintCalculator());// NOPMD: AvoidInstantiatingObjectsInLoops
-        return nextDecryptedStream(nextFactory, state);  // NOPMD: OnlyOneReturn
+                privateKey)) // NOPMD: AvoidInstantiatingObjectsInLoops
+        )
+        {
+          final PGPObjectFactory nextFactory = new PGPObjectFactory(plainText,
+                  new BcKeyFingerprintCalculator());// NOPMD: AvoidInstantiatingObjectsInLoops
+          return nextDecryptedStream(nextFactory, state);  // NOPMD: OnlyOneReturn
+        }
       } else if (pgpObj instanceof PGPCompressedData) {
         LOGGER.trace("Found instance of PGPCompressedData");
         final PGPObjectFactory nextFactory = new PGPObjectFactory(