package org.bouncycastle.asn1;

import java.io.IOException;
import java.io.InputStream;

class IndefiniteLengthInputStream
    extends LimitedInputStream
{
    private int _b1;
    private int _b2;
    private boolean _eofReached = false;
    private boolean _eofOn00 = true;

    IndefiniteLengthInputStream(
        InputStream in)
        throws IOException
    {
        super(in);

        _b1 = in.read();
        _b2 = in.read();
        _eofReached = (_b2 < 0);
    }

    void setEofOn00(
        boolean eofOn00)
    {
        _eofOn00 = eofOn00;
    }

    boolean checkForEof()
    {
        if (_eofOn00 && (_b1 == 0x00 && _b2 == 0x00))
        {
            _eofReached = true;
            setParentEofDetect(true);
        }
        return _eofReached;
    }

    public int read(byte[] b, int off, int len)
        throws IOException
    {
        // Only use this optimisation if we aren't checking for 00
        if (_eofOn00 || len < 3)
        {
            return super.read(b, off, len);
        }

        if (_eofReached)
        {
            return -1;
        }

        int numRead = _in.read(b, off + 2, len - 2);

        if (numRead < 0)
        {
//          throw new EOFException();
            _eofReached = true;
            return -1;
        }

        b[off] = (byte)_b1;
        b[off + 1] = (byte)_b2;

        _b1 = _in.read();
        _b2 = _in.read();

        if (_b2 < 0)
        {
            // Corrupted stream
//            throw new EOFException();
            _eofReached = true;
            // Just fall thru...
        }

        return numRead + 2;
    }

    public int read()
        throws IOException
    {
        if (checkForEof())
        {
            return -1;
        }

        int b = _in.read();

        //
        // strictly speaking we should return b1 and b2, but if this happens the stream
        // is corrupted so we are already in trouble.
        //
        if (b < 0)
        {
            // Corrupted stream
//            throw new EOFException();
            _eofReached = true;

            return -1;
        }

        int v = _b1;

        _b1 = _b2;
        _b2 = b;

        return v;
    }
}

@@ -25,16 +25,45 @@
 .asn1;%0A%0A
+import java.io.EOFException;%0A
 import j
@@ -1201,18 +1201,16 @@
       %7B%0A
-//
         
@@ -1215,87 +1215,66 @@
     
-throw new EOFException();%0A            _eofReached = true;%0A            return -1
+  // Corrupted stream%0A            throw new EOFException()
 ;%0A  
@@ -1451,34 +1451,32 @@
 orrupted stream%0A
-//
             thro
@@ -1501,73 +1501,8 @@
 ();%0A
-            _eofReached = true;%0A            // Just fall thru...%0A
     
@@ -1702,172 +1702,8 @@
 );%0A%0A
-        //%0A        // strictly speaking we should return b1 and b2, but if this happens the stream%0A        // is corrupted so we are already in trouble.%0A        //%0A
     
@@ -1759,18 +1759,16 @@
  stream%0A
-//
         
@@ -1801,64 +1801,8 @@
 ();%0A
-            _eofReached = true;%0A%0A            return -1;%0A
     

Throw exception correctly for unexpected end of file