NET-328 FromNetASCIIInputStream.read(byte[], int, int) may change length passed to superclass if not doing conversion

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0@963161 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java

@@ -156,11 +156,14 @@ public int read(byte buffer[]) throws IOException
     @Override
     public int read(byte buffer[], int offset, int length) throws IOException
     {
-        int ch, off;
+        if (_noConversionRequired)
+            return super.read(buffer, offset, length);
 
         if (length < 1)
             return 0;
 
+        int ch, off;
+
         ch = available();
 
         __length = (length > ch ? ch : length);
@@ -169,8 +172,6 @@ public int read(byte buffer[], int offset, int length) throws IOException
         if (__length < 1)
             __length = 1;
 
-        if (_noConversionRequired)
-            return super.read(buffer, offset, __length);
 
         if ((ch = __read()) == -1)
             return -1;