Browse Source

Don't copy more than the object size

If the loader's stream is broken and returns to us more content
than it originally declared as the size of the object, don't
copy that onto the output stream.  Instead throw EOFException
and abort fast.  This way we don't follow an infinite stream,
but instead will at least stop when the size was reached.

Change-Id: I7ec0c470c875f03b1f12a74a9b4d2f6e73b659bb
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.9
Shawn O. Pearce 15 years ago
parent
commit
7cfe2f12ff
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java

@ -169,14 +169,14 @@ public abstract class ObjectLoader {
final long sz = in.getSize(); final long sz = in.getSize();
byte[] tmp = new byte[1024]; byte[] tmp = new byte[1024];
long copied = 0; long copied = 0;
for (;;) { while (copied < sz) {
int n = in.read(tmp); int n = in.read(tmp);
if (n < 0) if (n < 0)
break; throw new EOFException();
out.write(tmp, 0, n); out.write(tmp, 0, n);
copied += n; copied += n;
} }
if (copied != sz) if (0 <= in.read())
throw new EOFException(); throw new EOFException();
} finally { } finally {
in.close(); in.close();

Loading…
Cancel
Save