PDFBOX-6079: close input stream to avoid a resource leak

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1928805 13f79535-47bb-0310-9956-ffa450edef68

Author: lehmi

fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java

@@ -480,7 +480,7 @@ private RandomAccessRead getExternalCMap(String name) throws IOException
         {
             throw new IOException("Error: Could not find referenced cmap stream " + name);
         }
-        return new RandomAccessReadBuffer(is);
+        return RandomAccessReadBuffer.createBufferFromStream(is);
     }
 
     private Object parseNextToken(RandomAccessRead randomAcccessRead) throws IOException

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java

@@ -122,8 +122,8 @@ final class FontMapperImpl implements FontMapper
             {
                 throw new IOException("resource '" + resourceName + "' not found");
             }
-            RandomAccessReadBuffer randomAccessReadBuffer = new RandomAccessReadBuffer(
-                    resourceAsStream);
+            RandomAccessReadBuffer randomAccessReadBuffer = RandomAccessReadBuffer
+                    .createBufferFromStream(resourceAsStream);
             TTFParser ttfParser = new TTFParser();
             lastResortFont = ttfParser.parse(randomAccessReadBuffer);
         }

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

@@ -195,19 +195,21 @@ public static PDTrueTypeFont load(PDDocument doc, File file, Encoding encoding)
     /**
      * Loads a TTF to be embedded into a document as a simple font.
      *
-     * <p><b>Note:</b> Simple fonts only support 256 characters. For Unicode support, use
-     * {@link PDType0Font#load(PDDocument, InputStream)} instead.</p>
+     * <p>
+     * <b>Note:</b> Simple fonts only support 256 characters. For Unicode support, use
+     * {@link PDType0Font#load(PDDocument, InputStream)} instead.
+     * </p>
      * 
      * @param doc The PDF document that will hold the embedded font.
-     * @param input A TTF file stream
+     * @param input A TTF file stream. It will be closed before returning.
      * @param encoding The PostScript encoding vector to be used for embedding.
      * @return a PDTrueTypeFont instance.
      * @throws IOException If there is an error loading the data.
      */
     public static PDTrueTypeFont load(PDDocument doc, InputStream input, Encoding encoding)
             throws IOException
     {
-        return load(doc, new RandomAccessReadBuffer(input), encoding);
+        return load(doc, RandomAccessReadBuffer.createBufferFromStream(input), encoding);
     }
 
     /**

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java

@@ -182,7 +182,7 @@ public static PDType0Font load(PDDocument doc, InputStream input) throws IOExcep
     public static PDType0Font load(PDDocument doc, InputStream input, boolean embedSubset)
             throws IOException
     {
-        return load(doc, new RandomAccessReadBuffer(input), embedSubset, false);
+        return load(doc, RandomAccessReadBuffer.createBufferFromStream(input), embedSubset, false);
     }
 
     /**
@@ -236,28 +236,28 @@ public static PDType0Font loadVertical(PDDocument doc, File file) throws IOExcep
      * Loads a TTF to be embedded into a document as a vertical Type 0 font.
      *
      * @param doc The PDF document that will hold the embedded font.
-     * @param input A TrueType font.
+     * @param input A TrueType font. It will be closed before returning.
      * @return A Type0 font with a CIDFontType2 descendant.
      * @throws IOException If there is an error reading the font stream.
      */
     public static PDType0Font loadVertical(PDDocument doc, InputStream input) throws IOException
     {
-        return load(doc, new RandomAccessReadBuffer(input), true, true);
+        return load(doc, RandomAccessReadBuffer.createBufferFromStream(input), true, true);
     }
 
     /**
      * Loads a TTF to be embedded into a document as a vertical Type 0 font.
      *
      * @param doc The PDF document that will hold the embedded font.
-     * @param input A TrueType font.
+     * @param input A TrueType font. It will be closed before returning.
      * @param embedSubset True if the font will be subset before embedding
      * @return A Type0 font with a CIDFontType2 descendant.
      * @throws IOException If there is an error reading the font stream.
      */
     public static PDType0Font loadVertical(PDDocument doc, InputStream input, boolean embedSubset)
             throws IOException
     {
-        return load(doc, new RandomAccessReadBuffer(input), embedSubset, true);
+        return load(doc, RandomAccessReadBuffer.createBufferFromStream(input), embedSubset, true);
     }
 
     /**