From 7623723498f108c616e850b5eaa5d7eb6adc23d6 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 4 Jun 2009 14:43:58 -0700 Subject: [PATCH] Disambiguate pkt-line "0000" from "0004" The pkt-line length includes its own 4 bytes. So "0000" is the magic flush/end marker used as part of the protocols based upon pkt-line, while "0004" indicates a packet of 0 bytes, but not a flush/end marker. Currently there is no need for this distinction in the code, as the protocol never sends an empty packet, but it reduces the risk that in the future a "0004" packet is misread as a "0000" flush. Signed-off-by: Shawn O. Pearce Signed-off-by: Robin Rosenberg --- .../org/spearce/jgit/transport/BasePackConnection.java | 5 ++--- .../spearce/jgit/transport/BasePackPushConnection.java | 2 +- .../src/org/spearce/jgit/transport/DaemonClient.java | 5 +---- .../src/org/spearce/jgit/transport/PacketLineIn.java | 18 +++++++++--------- .../src/org/spearce/jgit/transport/ReceivePack.java | 6 +++--- .../src/org/spearce/jgit/transport/UploadPack.java | 4 ++-- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java index c6440c70..0382d2bf 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java @@ -140,6 +140,8 @@ abstract class BasePackConnection extends BaseConnection { throw noRepository(); throw eof; } + if (line == PacketLineIn.END) + break; if (avail.isEmpty()) { final int nul = line.indexOf('\0'); @@ -152,9 +154,6 @@ abstract class BasePackConnection extends BaseConnection { } } - if (line.length() == 0) - break; - String name = line.substring(41, line.length()); if (avail.isEmpty() && name.equals("capabilities^{}")) { // special line from git-receive-pack to show diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java index 11171097..712d3c04 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java @@ -225,7 +225,7 @@ class BasePackPushConnection extends BasePackConnection implements + unpackStatus); String refLine; - while ((refLine = pckIn.readString()).length() > 0) { + while ((refLine = pckIn.readString()) != PacketLineIn.END) { boolean ok = false; int refNameEnd = -1; if (refLine.startsWith("ok ")) { diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonClient.java b/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonClient.java index 636cf22f..e80d86bb 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonClient.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/DaemonClient.java @@ -85,10 +85,7 @@ public class DaemonClient { rawIn = in; rawOut = out; - String cmd = new PacketLineIn(rawIn).readStringNoLF(); - if (cmd == null || cmd.length() == 0) - return; - + String cmd = new PacketLineIn(rawIn).readStringRaw(); final int nul = cmd.indexOf('\0'); if (nul >= 0) { // Newer clients hide a "host" header behind this byte. diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/PacketLineIn.java b/org.spearce.jgit/src/org/spearce/jgit/transport/PacketLineIn.java index ef218be8..92c70097 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/PacketLineIn.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/PacketLineIn.java @@ -50,6 +50,7 @@ import org.spearce.jgit.util.NB; import org.spearce.jgit.util.RawParseUtils; class PacketLineIn { + static final String END = new String("") /* must not string pool */; private static final byte fromhex[]; static { @@ -101,20 +102,23 @@ class PacketLineIn { String readString() throws IOException { int len = readLength(); if (len == 0) - return ""; + return END; - len -= 5; // length header (4 bytes) and trailing LF. + len -= 4; // length header (4 bytes) + if (len == 0) + return ""; final byte[] raw = new byte[len]; NB.readFully(in, raw, 0, len); - readLF(); + if (raw[len - 1] == '\n') + len--; return RawParseUtils.decode(Constants.CHARSET, raw, 0, len); } - String readStringNoLF() throws IOException { + String readStringRaw() throws IOException { int len = readLength(); if (len == 0) - return ""; + return END; len -= 4; // length header (4 bytes) @@ -123,10 +127,6 @@ class PacketLineIn { return RawParseUtils.decode(Constants.CHARSET, raw, 0, len); } - private void readLF() throws IOException { - if (in.read() != '\n') - throw new IOException("Protocol error: expected LF"); - } int readLength() throws IOException { NB.readFully(in, lenbuffer, 0, 4); diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java index eaa1016c..abaf8768 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java @@ -506,12 +506,14 @@ public class ReceivePack { for (;;) { String line; try { - line = pckIn.readStringNoLF(); + line = pckIn.readStringRaw(); } catch (EOFException eof) { if (commands.isEmpty()) return; throw eof; } + if (line == PacketLineIn.END) + break; if (commands.isEmpty()) { final int nul = line.indexOf('\0'); @@ -522,8 +524,6 @@ public class ReceivePack { } } - if (line.length() == 0) - break; if (line.length() < 83) { final String m = "error: invalid protocol: wanted 'old new ref'"; sendError(m); diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java index 5c8df62c..fcc1ef77 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java @@ -297,7 +297,7 @@ public class UploadPack { throw eof; } - if (line.length() == 0) + if (line == PacketLineIn.END) break; if (!line.startsWith("want ") || line.length() < 45) throw new PackProtocolException("expected want; got " + line); @@ -352,7 +352,7 @@ public class UploadPack { throw eof; } - if (line.length() == 0) { + if (line == PacketLineIn.END) { if (commonBase.isEmpty() || multiAck) pckOut.writeString("NAK\n"); pckOut.flush(); -- 2.11.4.GIT