[GitHub] [commons-io] garydgregory commented on a change in pull request #175: IO-429: Check for long streams in IOUtils.toByteArray

[GitBox <gi...@apache.org>]

garydgregory commented on a change in pull request #175:
URL: https://github.com/apache/commons-io/pull/175#discussion_r544754329



##########
File path: pom.xml
##########
@@ -384,7 +384,7 @@ file comparators, endian transformation classes, and much more.
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <!-- limit memory size see IO-161 -->
-          <argLine>${argLine} -Xmx25M</argLine>
+          <argLine>${argLine} -Xmx4223M</argLine>

Review comment:
       Not acceptable, leave as is for now.

##########
File path: src/main/java/org/apache/commons/io/IOUtils.java
##########
@@ -2243,10 +2243,13 @@ public static BufferedReader toBufferedReader(final Reader reader, final int siz
      * @param input the <code>InputStream</code> to read from
      * @return the requested byte array
      * @throws IOException          if an I/O error occurs
+     * @throws IllegalArgumentException if input is longer than the maximum Java array length
      */
     public static byte[] toByteArray(final InputStream input) throws IOException {
         try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            copy(input, output);
+            if (copy(input, output) == -1) {
+                throw new IllegalArgumentException("Stream cannot be longer than Integer max value bytes");

Review comment:
       @leskin-in 
   This condition will not happen for a `ByteArrayInputStream`, instead of you'll get a `IndexOutOfBoundsException` or am I missing something?

##########
File path: src/test/java/org/apache/commons/io/IOUtilsTestCase.java
##########
@@ -1331,6 +1332,15 @@ public void testCopyLarge_SkipWithInvalidOffset() throws IOException {
         }
     }
 
+    @Test public void testToByteArray_InputStreamTooLong() throws Exception {
+        try (CircularInputStream cin = new CircularInputStream(new byte[]{65, 65, 65}, ((long)Integer.MAX_VALUE) + 1L)) {
+            IOUtils.toByteArray(cin);
+            fail("IllegalArgumentException expected");
+        } catch (final IllegalArgumentException exc) {

Review comment:
       Use assertThrows()




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org