[PATCH JGIT] Method ignores results of InputStream.skip()
This method ignores the return value of java.io.InputStream.skip() which can skip multiple bytes. If the return value is not checked, the caller will not be able to correctly handle the case where fewer bytes were skipped than the caller requested. This is a particularly insidious kind of bug, because in many programs, skips from input streams usually do skip the full amount of data requested, causing the program to fail only sporadically. With buffered streams, however, skip() will only skip data in the buffer, and will routinely fail to skip the requested number of bytes.
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
hopefully this time Exchange server doesn't mangle the patch
.../jgit/transport/BundleFetchConnection.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BundleFetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BundleFetchConnection.java
index 40bf7db..2e2977e 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BundleFetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BundleFetchConnection.java
@@ -60,6 +60,7 @@
import org.spearce.jgit.revwalk.RevFlag;
import org.spearce.jgit.revwalk.RevObject;
import org.spearce.jgit.revwalk.RevWalk;
+import org.spearce.jgit.util.NB;
import org.spearce.jgit.util.RawParseUtils;
/**
@@ -139,9 +140,9 @@ private String readLine(final byte[] hdrbuf) throws IOException {
while (lf < cnt && hdrbuf[lf] != '\n')
lf++;
bin.reset();
- bin.skip(lf);
+ NB.skipFully(bin, lf);
if (lf < cnt && hdrbuf[lf] == '\n')
- bin.skip(1);
+ NB.skipFully(bin, 1);
return RawParseUtils.decode(Constants.CHARSET, hdrbuf, 0, lf);
}
--
1.6.2.2.1669.g7eaf8
Sohn, Matthias <matthias.sohn@sap.com>